Revert "wip"

This reverts commit 0a08c1841affcd4192507f81758a96ae97c415da.
Validate custom user data on upload
Add upload validation to product custom data
Refactor user/product custom error handling
Merge branch 'master' of github.com:dimagi/commcare-hq into custom_user_data
Add help-text to hover question-mark
Merge remote-tracking branch 'origin/master' into custom_user_data
Add choices to the Edit Custom Data Fields UI
add choices to edit UI
pep8
Pull out required and choice validation