Merge "Refactor OC4 cluster for K8s" into release/2018.11.0