remove trailing spaces
Add CAPTCHA to contact_us_form. Fixes #8773