[#53022305] Various bug fixes.
Merge branch 'ticket53022305-model-calibration' of github.com:NREL/OpenStudio into ticket53022305-model-calibration

Conflicts:
	openstudiocore/src/openstudio_lib/UtilityBillsView.cpp