Issue #2096361 by mglaman, bendiy, d.moiseev: Move Product Match functions from db_select to EntityFieldQuery