Merge "Setup os-ha-contrail for FIP"