etcd: deprecate remaining v0.4.6 flags
etcd: sort list of deprecated flags
Merge pull request #1168 from bcwaldon/moar-flags

etcd: deprecate remaining v0.4.6 flags