Merge "Improve database endAtomic() error messages"