NCI-Agency/anet#311 Refactor organization form fields
NCI-Agency/anet#311 Refactor organization form fields

Refactor fields that use dictionary labels to use the
DictionaryLabelField HOC.

NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet