Fix errors in multi stage systems

These are changes introduced in
https://github.com/NREL/OpenStudio/commit/897226cd7752ab332dfe66d61648a2141259f5b9
but oddly not included in merge to HVACTest.