Fix for JaCoCo and Surefire / argLine
Sonar fixes