Merge "Workaround for request header values with trailing '\n'"