Merge pull request #886 from ogail/dev

Merge reviewed code
Added logging and exception-handling infrastructure
response to cr feedback
Merge pull request #889 from markcowl/scenarioInfrastructure

Added logging and exception-handling infrastructure