Merge branch 'release/7.x-0.21' into develop
remove hook_form_FORM_ID_alter - already defined in ting_agency
tagging version 7.x-0.22
Merge branch 'release/7.x-0.22'