COMMONS-190 - Clean up development testing config.
Merge remote-tracking branch 'origin/feature/stabilization'