=htc #16482 preserve header order during parse
Merge pull request #16485 from 2beaucoup/header-order-fix

=htc #16482 preserve header order during parse