Merge branch 'trivial/CConnectionManagerStyle' into protobuf_noprotobufs

Conflicts:
	Broker/src/CConnectionManager.cpp
	Broker/src/CConnectionManager.hpp
	Broker/src/CListener.cpp
	Broker/src/IPeerNode.cpp
Temp backup commit, don't be pulling this stuff