[#57004836] get discrete variables working and add simulation ids
Merge tag 'v1.0.6' into 57004836-EnhanceSimulationEngine

Updating EnhanceSimulationEngine with current stable work.
[#57004836] Fix finding of run dir from node modules on macos
[#57004836] Update to use oliver--- branch of swig-v8
[#57004836] Support simulationHours for parallelenergyplus runs
Merge branch 'develop' into 57004836-EnhanceSimulationEngine

Conflicts:
	openstudiocore/CMakeLists.txt
I think this fixes the last issue, but now seeing issues that occur with swapping on entity delete, I don't know if this is a new issue or not

[#59994516]
[#53230709] Initial UserScriptJob merging and unit test
[#53230709] Get UserScriptJob merge unit tests executing

Now we need to:

  - serialize the parameters for the subsequent merged jobs
  - update UserScriptAdapter to call the merged jobs
[#53230709] Properly populate sub folders of merged jobs
[#53230709] Merging of UserScriptJobs working
[#53230709] Reduce potential duplicate model parsing
[#53230709] Make all files from merged script runs available

And merge the loaded results.ossr files
Update OS IDD with new refrigeration components
Fix Condenser:EvaporativeCooled Air Inlet Node

This fixes Air Inlet Node Name in
Refrigeration:Condenser:EvaporativeCooled, which does not accept a
ThermalZone as an input. This field will not be used and removed from
the public api (commented out).
Merge remote-tracking branch 'origin/OSX_mavericks' into Refrigeration_part_3_MA
Fix build error in RefrigerationCondenserEvaporativeCooled
Merge branch 'develop' into Refrigeration_part_3_MA

Conflicts:
	openstudiocore/resources/model/OpenStudio.idd
	openstudiocore/src/energyplus/CMakeLists.txt
	openstudiocore/src/energyplus/ForwardTranslator.cpp
	openstudiocore/src/energyplus/ForwardTranslator.hpp
	openstudiocore/src/model/CMakeLists.txt
	openstudiocore/src/model/ConcreteModelObjects.hpp
	openstudiocore/src/model/Model.cpp
	openstudiocore/src/model/ScheduleTypeRegistry.cpp
Fix merge conflicts
Merge branch 'Refrigeration_part_3_MA' of https://github.com/ORNL-BTRIC/OpenStudio into Refrigeration_part_3_MA