spelling
correct link for collective.zamqpdemo
Fix to not reset port for ConsumingServer
Merge branch 'master' into datakurre-use-vhm-root