merge with the latest master and fix conflict
#1290 - added updates to fix help text not appearing on membership field
Merge branch 'master' into sno_branch_updates
Merge branch 'sno_branch_updates' into bixly-testing