Merge "Change K8s version for OC4.0 + fix keepalived"