Imported Upstream version 3.1.12
Imported Debian patch 3.1.12-1
Merge tag 'debian/3.1.12-1'

Debian release 3.1.12-1
Remove outdated patch
Backport fix for tests
Reinstate init script patch lost in 3.1.12-1pexip1.