Make testing timings.cfg a symlink
Merge branch 'master' into protobuf

Conflicts:
	Broker/testing/config/timings.cfg