Merge branch 'master' into protobuf_noprotobufs

Conflicts:
	Broker/src/CConnectionManager.cpp
	Broker/src/device/types/CDeviceLogger.hpp
	Broker/src/lb/LoadBalance.cpp
Temp backup commit, don't be pulling this stuff