Improve Python 3.x compatibility

A bit of mechanical translation to clean
out the deprecated except x,y: construct

Change-Id: I80883b6b0c014bdf4799e8b7b2c4a4a07d951a0b
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp