More Jenkins CI fixes

[ci:skip]
More Jenkins CI fixes

[ci:skip]
Merge branch 'master' into eternal_sunset

Conflicts:
	dev/ci/run_jenkins.sh

[ci:skip]