Merge "fix interfaces for k8s and opencontrail"