Merge "Clean up hwvtep csit combinations and triggers"