Update hacking for Python3

The repo is Python 3 now but still tests some older
branches, so update hacking to version 2.0 which
supports Python 2 and 3.

Fix problems found.

Change-Id: I54f1fa0ee72499a740e630bbd3478427babc2ec2
(cherry picked from commit d74b4383d82263a516b42aebf3745344661579d9)
(cherry picked from commit 5a3984de80ee166269a3ec5ba58b3efdc49e1afe)
2 files changed