Merge "[Cps Path Parser] Fixes for parent path & normalization"