Merge "Bug-1517: Introduce topology data-change counter"