Fix Keywords Sent to Ad Server

They shouldn't have '+' in them.
eg. 'Secure + protect' -> 'secure-protect'
Improve Regex to Replace Keyword Characters
Merge pull request #4197 from guardian/kc-secure-protect

Commercial: Fix Keyword Encoding