GWT-571  checkstyle errors fix