HTMLBlock: reset HTML otuput type of after making it more strict in simplelayout_schemas.
Merge branch 'jone-htmlblock-content-types'

Conflicts:
	docs/HISTORY.txt