fix(scripts/test-cluster): use v2 flags and find the path for etcd
bump(github.com/coreos/go-log): 70d039bee4b0e389e5be560491d8291708506f59
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  bump(github.com/coreos/go-log): 70d039bee4b0e389e5be560491d8291708506f59
  fix(scripts/test-cluster): use v2 flags and find the path for etcd