Merge pull request #328 from thaJeztah/19.03_backport_jenkinsfile

[19.03 backport] Jenkinsfile and related test-changes