Merge "Fix k8s+OC order, install pool.service before addons"