Merge "Bug 1616: Issues with using container and default values in config yang"