Merge pull request #1644 from clebertsuconic/2.4.x

IDE fixes
updating surefire