Merge "Normalize parent xpath when building datanodes in CpsDataService"