CORE-4671: Added KLUDGE annotations 
This is to track the changes related to this ticket, as they will have
to be revisited when we update GXT.