[AC-6882] Merge remote-tracking branch 'origin/development' into AC-6882
[AC-6882] Merge remote-tracking branch 'origin/development' into AC-6882

* origin/development:
  add help text constant
  fix Ethno-Racial and Gender multi-select field

masschallenge/django-accelerator,masschallenge/django-accelerator