Make ContentDecodingError a subclass.

This should avoid the user having to worry about the new exception.
Changelog for 2.2.0.
Merge pull request #1854 from Lukasa/220

Changelog for 2.2.0.