add fixes for k8s with contrail

Change-Id: If68bab3e07865f68ebd495db090bef016db55056
5 files changed