Merge "Undo manipulation of YangResource string as this is now handled correctly in DMI PLugin"