Merge "Extend for deploy k8s+contrail"