Merge "Move CAPTCHA messages into ConfirmEdit and update class names"