Fix cache-control override. Closes #2011
Merge branch 'master' of github.com:hapijs/hapi