3.0  CS correction

- fixes all CS errors coming out last night
- fixes Jenkins build as `testDefaultOutputAs()` modification wasn't merged from 2.6