Merge "Bug 4719 Shiro integration into restconf"