Make uberjar use the filename returned by jar instead of recalculating.
Merge remote-tracking branch 'upstream/master' into testsUnderWindows1