swapping order of param substitution when getting effective client name so build parameters are properly evaluated
Merge remote-tracking branch 'remotes/stuartrowe/master' into variables_handling_refactoring

Conflicts:
	src/main/java/hudson/plugins/perforce/PerforceSCM.java

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>