etcdmain: do not exit inappropriately
Merge pull request #1681 from jonboulle/fix_exit

etcdmain: do not exit inappropriately