Merge "BUG-2673: make CDS implement DOMDataTreeChangeListener"