Merge "Ignore TEMPLATE.html in LayoutTest directories"