merge to kubernetes 91efe517701660ea6b54769fd017e97d9845c6fc

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.