Issue #2880344 by jzavrl, Munavijayalakshmi, arunkumark, borisson_: Removed deprecated Database queries