CVdV-au

Results 2 issues of CVdV-au

As discussed with @jeremyk-91 and @j-baker

==COMMIT_MSG== Oracle hints/query improved; dead DBKVS code removed ==COMMIT_MSG== **Priority**: High, see #pds-594762

autorelease
merge when ready