Merge with master

Author: Routing CI (Automated)

.gitmodules

@@ -55,15 +55,6 @@
 [submodule "src/github.com/cloudfoundry/gunk"]
 	path = src/github.com/cloudfoundry/gunk
 	url = https://github.com/cloudfoundry/gunk
-[submodule "src/github.com/cloudfoundry/storeadapter"]
-	path = src/github.com/cloudfoundry/storeadapter
-	url = https://github.com/cloudfoundry/storeadapter
-[submodule "src/github.com/coreos/etcd"]
-	path = src/github.com/coreos/etcd
-	url = https://github.com/coreos/etcd
-[submodule "src/github.com/coreos/go-etcd"]
-	path = src/github.com/coreos/go-etcd
-	url = https://github.com/coreos/go-etcd
 [submodule "src/github.com/dgrijalva/jwt-go"]
 	path = src/github.com/dgrijalva/jwt-go
 	url = https://github.com/dgrijalva/jwt-go