Merge branch 'ceej/tiered-tests' - consolidated surefire configuration,
and added ability to enable/disable groupings of tests at the top level.