Backport upstream fix to our custom header.html.tmpl template

http://bzr.mozilla.org/bugzilla/4.2/revision/8182

Change-Id: I0b2b3f30d578efadb0e79d2c43330566c8e19b61
Merge "Backport upstream fix to our custom header.html.tmpl template"