NAS-2369: surefire needs to look for **/*Test*.java
Merge branch 'NAS-2369'