Merge "BUG-509: merge InMemoryDataTreeModification.resolveSnapshot()"