BATCH-1948: Add @StepScope and associated tests
BATCH-1948: Formatting and javadoc fixes
Merge pull request #106 from dsyer/BATCH-1948

* BATCH-1948:
  BATCH-1948: Formatting and javadoc fixes
  BATCH-1948: Add @StepScope and associated tests