Merge "Run test_service_type_management test only if extension is available"