Sync with global requirements

And fix (new) H231: Python 3.x incompatible 'except x,y:' construct

Change-Id: I7c4adba2ea0618c4ad66bdc9f316af6159567261