Merge "Remove openflow triggers from ovsdb jobs"