Triggered by fixes
Merge branch 'master' into triggered-fixes
Merge branch 'master' into JENKINS-22733-long-tasknames

Conflicts:
	src/main/webapp/pipe.js