Merge "Add !!html/php parser test for HTML comment after template name"