Updated based on issue #366.
Merge remote branch 'origin/CyberPhysicalInvariant' into CyberPhysicalInvariant

Conflicts:
	Broker/src/lb/LoadBalance.cpp