Merge "Use Java 7 new method getLoopbackAddress in ClusterManager"