Fixes from upstream

This cherry-picks two upstream patches that makes it possible to switch from python2->python3 and fixes the FTBFS (test failure).

Only build tested.

Please update debian/changelog via "gbp dch --auto".