Fix xpath building for data nodes addressing YANG augmentation