3.0 bake task cleanup

Clean up bake task and the various subclasses

* Remove duplication in the option setup.
* Fix plugin AppController generation. See #3229