[FIX] Some Checkstyle fixes.
Merge pull request #941 from LeoWoerteler/checkstyle-fixes

[FIX] Some Checkstyle fixes.
Merge branch 'stable'