etcdmian: add tests for configuration parsing
Merge pull request #1981 from xiang90/flag_test

etcdmian: add tests for configuration parsing
doc: doc addition/fix for discovery-srv flag
Merge pull request #1982 from xiang90/srv_doc

doc: doc addition/fix for discovery-srv flag
raft: add doc for storage
Merge pull request #1983 from xiang90/raft_storage_doc

raft: add doc for storage
fix an error in the 2.0 config docs
Merge pull request #1985 from mgwilliams/config-docs

fix an error in the 2.0 config docs
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  fix an error in the 2.0 config docs
  raft: add doc for storage
  doc: doc addition/fix for discovery-srv flag
  etcdmian: add tests for configuration parsing