[Reviewer: Matt] Don't strip quotes for values that can validly be quoted strings

Matt, can you review this change to not strip quotes from the custom header parameters (if they can validly be quoted strings). 

Fixes #510