Use six.reraise where necessary

Note: the re-raising in serving.py causes the serving testcases to hang