Fix for surefire.forkNumber issue (tested)

Squashed commit of the following:

commit 415da770856cd53f6dfbfd87cb59397f0039e46b
Author: Agoston Horvath <agoston@ripe.net>
Date:   Mon Apr 7 14:33:12 2014 +0200

    further fixes

commit 4864dfc70eb7bef69587ea222994fe444311f5a5
Author: Agoston Horvath <agoston@ripe.net>
Date:   Mon Apr 7 14:03:52 2014 +0200

    try jvmId idea again