Merge "Add JMX support for Zookeeper service"