Merge pull request #2034 from tmackay/my-changes

[*] BO : Search field consistency with combinations and fix for WS
// cherry-pick
// cherry-pick
// cherry-pick
// cherry-pick
// cherry-pick
// cherry-pick
// cherry-pick
// cherry-pick
// cherry-pick
// cherry-pick
// cherry-pick
// cherry-pick
// cherry-pick
// cherry-pick
[*] IN : improved search configuration with local stopwords
// cherry-pick
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// Fixed charset from previous commit
// fix scroll_if_anchor()