Rebase conflict
BATCH-1924: Updated SimpleFlow to correctly continue processing on the restart of a STOPPED state
Merge pull request #154 from mminella/BATCH-1924

* BATCH-1924:
  BATCH-1924: Updated SimpleFlow to correctly continue processing on the restart of a STOPPED state
  Rebase conflict