Merge branch 'release/7.x-0.6' into develop
bug 17566 - untranslated searchcodes
add helptext placeholder to render array
release 7.x-0.7
Merge branch 'release/7.x-0.7'