Merge "Update Stacklight k8s-contrail models"