test: actually test main pkg
etcd: replace -proxy-mode with -proxy
Merge pull request #1106 from bcwaldon/proxy-flag

Replace -proxy-mode=<bool> with -proxy=<enum>