Copy changes from checkboxlist and refactor changes to match existing
code.  See WW-4181.
For eclipse