Merge "Fix errors reported by phpcs in includes/HTMLForm.php"