Squash merge branch 'clustermanager-master.2' into 'master' feature: bcs-cluster-manager support ipv6