Merge branch 'trivial/ClockSynchronizerPrivates' into protobuf_noprotobufs

Conflicts:
	Broker/src/CClockSynchronizer.hpp
Temp backup commit, don't be pulling this stuff