Fixing linux build error
Fix serious bug related to adding zones

When adding zones after terminals the terminal will not get properly
added to the equipment list.  This is a serious bug introduced by plenum
changes.
Merge branch 'develop' of https://github.com/NREL/OpenStudio into develop
Merge remote-tracking branch 'origin/develop' into 66147226-SmartSetpoints