Fix package dependencies

Marcel Looserequested to merge
fix-dependencies into master

Added missing package dependencies. Removed a few obvious Python 2.x code lines.

Merge request reports