dollar escaped in PATH and JAVA_HOME, : delimiter added prior to $PATH
(cherry picked from commit 9a9770e1d30e73205d288c13ffbad88f2c10ad4d)
Bump Jenkins version
Existence of deploy script has to be checked on build node, not on master
Merge branch 'master' of github.com:vjuranek/smartfrog-plugin

Conflicts:
	etc/support/deploySF.sh
	etc/support/diagnoseSF.sh
	etc/support/runSF.sh
	etc/support/stopSF.sh