Don't generate bootstrap, use CA bootstrap

Merged Stewart Martin-Haugh requested to merge smh/athena:config_add_cleanup into master

Start using the ComponentAccumulator bootstrap rather than generating one using athena. No differences in output.

Merge request reports