[FIXED JENKINS-16412] Don't use the module name for cleanup if flatten
is true
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/hudson/scm/AbstractCvs.java