merge to kubernetes 6c434e6646ba0ececcd2c09a9ebac32882dbf7c4

Remember that you must run with rights to modify iptables.  This includes test-cmd.sh and test-end-to-end.sh.  You might have trouble with firewall rules against the deployments.  Just allow docker0 rights to 8080.