Cleanup code with proper OS name and OpenStack name embededded in job names