LPS-48740 Ensure that all lastMergeTime is updated after all modificatio...

...ns and changes to modifiedDate