2to3: except fix

  except Exception, e: -> except Exception as e:

The latter syntax was introduced in Python 2.6

Change-Id: I1659cf6b29d3b2477535581017ee5e6a5fa22826
Merge "2to3: except fix"