Fix x-forward headers. Closes #1477
Merge branch 'master' of github.com:spumko/hapi