Merge "rename artifactory cleanup job to artifact cleanup"