Merge "Send 500 http status code, instead of 200, for DBConnectionErrors"