Keep the options of server.inject untouched #2000
Remove timer from a bad copy/paste
Replace negotiator
Merge pull request #2005 from hapijs/accept

Replace negotiator
Merge pull request #2001 from fampinheiro/master

Keep the options of server.inject untouched #2000
Cleanup for #2001
Fix changes to route config with multiple methods. Closes #1995
Allow enabling status codes for caching header. Closes #1984
6.11.0