replaced e.message

BaseException.message has been deprecated as of Python 2.6.
http://legacy.python.org/dev/peps/pep-0352/
Replaced e.message with six.text_type(e) (uses unicode with
Python 2.x and str with Python 3.x).

Change-Id: I53aa5268ae9d262d19e3649df47e2aac1770a129
Merge "replaced e.message"