Merge the "don't run template on HEAD requests" branch.
This should stop us from getting OOPS during HEAD requests from haproxy (bug #701329). It also should mean that at least most HEAD requests stop returning body content (bug #716201), and that we perform less total work to return HEAD info (bug #716217).