DS-1166.  Reverted surefire and checkstyle plugin versions (for Sonar).
Merge branch 'master' into DS-1008