Merge branch 'release/7.x-1.22' into develop
bug17506 - add placeholder: user_not_municipal
updated to version 7.x-1.23
Merge branch 'release/7.x-1.23'