Merge "Simplify YangInstanceIdentifier references"