Merge "Bug 735 - Part 2 - Modify controller to reference new yang-types bundle and...