Imported Upstream version 2.3.3-4
Merge tag 'upstream/2.3.3-4'

Upstream version 2.3.3-4
Updates to packaging for 2.3.3-4
Remove outdated patches