Merge "Fix feature-test failing with surefire 2.18"