Bug Fixes

#1569495 (Bug #92417) ** A delay in the replication of a consistency point will no longer corrupt the journal written by a 'journalcopy' thread.

#1566131 (Bug #91885) ** Submitting a moved 'utf8' file using a pre-15.2 client no longer results in a missing archive.

#1564066 (Bug #92442) ** 'p4 resolve' now has an undoc flag '-dx' which can be used to make the 3-way merge algorithm perform more like the unix 'diff3 -m' merge. Typically merge tends to remove duplicate lines in adjacent inserts from 'theirs' and 'yours', with this flag all the lines in the inserts from both legs of the merge will be inserted.