Merge branch 'trivial/ClockSynchronizerConst' into protobuf_noprotobufs

Conflicts:
	Broker/src/CClockSynchronizer.cpp
	Broker/src/CClockSynchronizer.hpp
Merge branch 'trivial/ClockSynchronizerStatics' into protobuf_noprotobufs
Temp backup commit, don't be pulling this stuff