Merge "Enable sidecar for kube2msb"