Merge branch 'router-prefix2' into router-custom-prefix
Merge branch 'router-custom-prefix' into router-miracle2k
router: Support custom etcd prefix.

Signed-off-by: Michael Elsdörfer <michael@elsdoerfer.com>
Merge branch 'router-custom-prefix' into router-miracle2k

Conflicts:
	router/server.go