master
Squashed commit of the following:
Remove remnants of SubProcess from Service System
code-format
Checkout output of tests.