Merge branch 'refs/heads/iana-port-change'
Bump version to v0.9.6 for CoreOS Beta 324.5.0
Specify instance names and host names

to recognize them in global-status easily
Remove duplicated space
Merge branch 'refs/heads/master' into alpha
Bump version to v0.9.9 for CoreOS Alpha 349.0.0