Merge "Bug 5526 - Added new servlet to the web.xml for new restconf implementation"