Merge "UPSTREAM: iptables: insist that the lock is held."