Merge "Rename iptables-based active-standby jobs"