Work on checkstyle config. Checkstyle corrections in master server.