Merge pull request #272 from remear/master

Roll with the changes
Merge pull request #273 from remear/master

Java scenario updates
WIP multi-rev. Bring over matthewfl changes.