Imported Upstream version 2.21
Merge tag 'upstream/2.21'

Upstream version 2.21
Updated debian/changelog for 2.21
Removed patches no longer needed in 2.21.