Comment 29 for bug 904072

Vish's patch against master needed some rebasing after Vek's "Serialization, deserialization, and response code decorators" commit. Nothing major.

I've taken the liberty of combining the vuln/testfix patches, rebasing and adding a commit message. I've retained Vish as the author of the commit.