Merge "Consolidate some tempest tests in the neutron-tempest-plugin jobs"