Fixing checkstyle issues for SNAPSHOT build
Fixing more checkstyle issues for SNAPSHOT build