Improve Python 3.x compatibility

Mechanical translation of the deprecated
except x,y: construct with except x as y:
The latter works with any Python >= 2.6.
Add Hacking check.

Change-Id: I845829d97d379c1cd9b3a77e7e5786586f263b64
Merge "Improve Python 3.x compatibility"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp