Bug 1011661 - Add uppercase for compositeKey

Add support for uppercase and lowercase version of compositekey.

Introduce field `upperCompositeKey` that store the uppercase
version.