GWTII-183: checkstyle corrections