Implement a keyword check in Jenkins that will set allFuncTest to true, running all functional tests on the merge build.
This will prevent the need to stop and restart a build with the checkbox, and hopefully prevent css (and the like) merge breakages.
This won't work very well until is fixed.