Merge "Added YANG models for base concepts in the controller"