Removed many "// CSOK: ConstantName" instances for constants, by converting them to uppercase as they should really be. Fixed some other non-Checkstyle issues on the way, imports mainly. Removed some "log" instances that were not used.