GCP-8050 -- applied change to handle variations of the file pattern where there are extra characters after the main pattern ( for limited file name customization, for auto rename in windows to handle multiple downloads of the same file name, etc)
Merge remote-tracking branch 'origin/branch_release_20140410' into branch_release_20140410

Conflicts:
	src/main/java/org/generationcp/ibpworkbench/actions/RestoreIBDBSaveAction.java