Committed trailing fixes for page.html to page.tpl.html migration.