Merge "Add OPENSCAP_TEST_TYPE param to openscap job"