etcdmain: simplify proxy start logic
Merge pull request #1613 from jonboulle/proxy_clean

etcdmain: simplify proxy start logic