Merge "(bug 50078) Allow a string other than '*' as condition for DatabaseBase::delete()"