Few fixes for k8s-ha-contrail-40

Change-Id: If847a721c69bf0e4933c6ef3e1cc14bd5119e9ab
7 files changed