fix prod failure of /hq/admin/commcare_settings/ due to odd combination of settings
Merge pull request #891 from dimagi/custom_suite

fix prod failure of /hq/admin/commcare_settings/