Adding capability to use ChoiceField with upper case string value

Signed-off-by: Alexander Lehnert <alex.lehn@googlemail.com>