WL-3602 : re-inserting code that got lost in merge

I just did a fresh checkout and re-applied the patches I had for the JIRAS.

This covers WL-3602, adding recaptcha to handlebars, WL-3598, WL-3566