[FIXED JENKINS-17930] By default do the cleanup regardless on the job result
[FIXED JENKINS-17930, JENKINS-17940] Fix backward compatibility
Remove unused import