Merge "iptables: Change locking semantics."