Merge "fix typos and some Java improvements in ClusterManager"