Make html_table_gen consistent with html_table.h

In commit 6dabd7de04ae3ed the html_table.h was changed manually,
without changing the underlying generator (html_table_gen.php).
This commit fixes it.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Make html_table_gen consistent with html_table.h
Fix merge
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix merge
Merge branch 'PHP-5.6'

* PHP-5.6:
  Make html_table_gen consistent with html_table.h