Merge "Fix PHPCS warnings in includes/htmlform/"