Merge "Updated context references in yang-ext"