Scope oid query to user database
Merge remote-tracking branch 'origin/CDB-1260' into release/2.7.0