SPDY: code cleanup
Merge pull request #1928 from jpinner/spdy_cleanup_master

SPDY: code cleanup
Merge remote-tracking branch: upstream/master