Bug 1011661 - Add uppercase for compositekey

Add support for uppercase and lowercase version of compositekey.

Introduce field `uppercasecompositekey` that store the uppercase
version.
Remove this part -- this should not be covered in this patch.