Merge pull request #329 from thaJeztah/18.09_backport_jenkinsfile

[18.09 backport] Jenkinsfile and related test-changes