Merge "Bug 1341 - Make RESTConf websocket port configurable"