RFR: 45: Fix remaining integration test issues

[Robin Westberg via github.com]

The pull request has been updated with additional changes.

----------------

Added commits:
 - 6947965f:	Additional GitLab specific fix

Pull request:
http://git.openjdk.java.net/skara/pull/31

Webrevs:
 - full: https://openjdk.github.io/cr/skara/31/webrev.01
 - inc: https://openjdk.github.io/cr/skara/31/webrev.00-01

Updated full patch:
http://git.openjdk.java.net/skara/pull/31.diff

Fetch command:
git fetch https://github.com/openjdk/skara.git pull/31/head:pull/31