Merge branch 'release/7.x-1.21' into develop
#1319 make login link modal
tagging version 7.x-1.22
Merge branch 'release/7.x-1.22'