Merge branch 'release/7.x-0.20' into develop
bug#16534: translate boolean operators used in form values
bug#16535: make it possible to combine search terms in term values
Revert "bug#16535: make it possible to combine search terms in term values"

This commit breaks search on develop

This reverts commit feb515f13a8af04defc1f5023d0171f3e46fde42.
bug#16535: make it possible to combine search terms in term values
update help
updated to version 7.x-0.21
Merge branch 'release/7.x-0.21'