Merge "Bug 2933: Make DataTreeModification and Listeners type-safe"