Merge tag 'upstream/2.2.0'

Upstream version 2.2.0
remove obsolete patches
changelog for 2.2.0
added .scons directory to clean target
updated man pages
Merge tag 'upstream/2.2.2'

Upstream version 2.2.2
bump to 2.2.2
Merge branch 'upstream'
bump compat
fixed manpage typo