[4.4] Upgrade two template files and reapply our custom changes

DO NOT COMMIT until Bugzilla has been upgraded to 4.4.

Also kill loading Dusk. It was loaded as alternative CSS in
4.2 but was enabled by default in 4.4 due to custom code and
http://bzr.mozilla.org/bugzilla/trunk/revision/8553 .
It has always looked ugly when explicitly enabling it.

Change-Id: If24dee5f6c69c6fc374370db2ec2a49162335ab2