Merge "Move some DB error classes with the rest as type DBUnexpectedError"