Generate a uniqueish id for each request, send to client on server error and make available to users for correlation.
Merge branch 'request_id'