Merge "Move OC addons from k8s part to OC part"