Merge "Bug 931, Bug 910 - Enhance Restconf Swagger Documentation"