Add choices to options metadata for ChoiceField.
Add more context to the ChoiceField metadata.
Add unittests for ChoiceField metadata.

Rename 'name' to 'display_name'.
Merge pull request #1250 from Ian-Foote/choice_field

Add choices to options metadata for ChoiceField.