LPS-48740 Ensure that all lastMergeTime is updated after all modifications and changes to modifiedDate