Adapt packaging for a py2 only environment

Signed-off-by: Louis Bouchard <louis.bouchard@canonical.com>
Fix upstream code so it runs in a py2 only environment

Signed-off-by: Louis Bouchard <louis.bouchard@canonical.com>