Merge "Controller 3node: jolokia instead of netconf-connector"