Merge pull request #461 in CASA/casa6 from CAS-13464 to master
* commit '4be4bb54de79a84106f7fe76850a9069b08c3be2':
use new tricky imagename in tfmask after merge, CAS-13464
Remove spurious -line that didn't belog in this branch
Revert spurious changes included by mistake
Revert "Revert "Merge remote-tracking branch 'origin/master' into CAS-13464""
Revert "Merge remote-tracking branch 'origin/master' into CAS-13464"
more tricky names, now with dashes, ->CASA6, CAS-13464
exercise more tricky names, now with dashes, CAS-13464
exercise more tricky names, with + and -, ->CASA6, CAS-13464
exercise more tricky names, with + and -, CAS-13464
escape special characters in imagename for re ->CASA6, CAS-13464
escape special characters in imagename for re, CAS-13464
more strict exclusion of non-dir, non-image dir entries ->CASA6, CAS-13464
more strict exclusion of non-dir, non-image dir entries, CAS-13464
