Combine acceptance test files
Config is testing the same thing latest and there's no need to clean the
entire puppetserver in between. This speeds up the execution time.
The upgrade tests are combined into a single file and also includes
Puppet 7 upgrade tests now.