Preserve header count when a value is replaced

[jessie-murray]

Sorry about this, here is the fix as suggested. I added a test in the curl script since I think this fit better than with the Python tests.