3.0  CS correction

- fixes all CS errors coming out last night
- fixes Jenkins build as `testDefaultOutputAs()` modification wasn't merged from 2.6
Sorry about this. For some reason I thought that this was one of the changes in a duplicate pr.