CS fixes
Refs #6138 Added new field 'current_tick' to Scenario.
Merge pull request #1 from Restless-ET/develop

Develop into Master