optionally get etcd vals from master, squash stack traces, and fix lint issues
Merge remote-tracking branch 'upstream/develop' into etcd_mods
removing redundancy
Merge remote-tracking branch 'upstream/develop' into etcd_mods
mistakenly removed default values
refactor per recommendation of techhat
Merge remote-tracking branch 'upstream/develop' into etcd_mods
refactor per recommendation of techhat
unify return types
Merge pull request #13270 from khrisrichardson/etcd_mods

optionally get etcd vals from master, squash stack traces, and fix lint ...