Fix pep H231  Python 3.x incompatible 'except x,y:' construct

Change-Id: I00effa3cb87bf334c68eb2c3b65ff46d3fb69e4f
Merge "Fix pep H231  Python 3.x incompatible 'except x,y:' construct"