Fix passthrough headers merge. Closes #1776
Merge branch 'master' of github.com:spumko/hapi