Hand-merged (minor) remaining differences to finish the move to the current version; basically just a bit more anal handling of HTTP header capitalization.