Fixes as a result of testing.
Fixes as a result of testing.

mesosphere/deimos,davidbliu/deimos-etcd-mod,davidbliu/deimos-etcd-mod,midonet/mcp,solidsnack/deimos,midonet/mcp,mesosphere/deimos,solidsnack/deimos