Issue #2117305 by disasm, Pavan B S, ieguskiza, Jo Fitzgerald: Replace usages of db_or() and db_and()
