RFR 7902157: Resolving various test issues when building/testing with maven

[Erik Greijus]

Hello all,

Please have a look at this review.

Bug: https://bugs.openjdk.java.net/browse/CODETOOLS-7902157 <https://bugs.openjdk.java.net/browse/CODETOOLS-7902157>
Webrev: http://cr.openjdk.java.net/~shurailine/7902157/webrev.00 <http://cr.openjdk.java.net/~shurailine/7902157/webrev.00>

Thanks
/Erik