EST-228: checkstyle changes, fixing line length to 120 or less.