Merge "htmlform: Fix multiple PHPDoc annotations in htmlform module"