Issue #2389335 by Berdir, naveenvalecha, claudiu.cristea, almaudoh, joachim, jibran: Deprecate entity.query service and replace with using the entity storage's getQuery() method (cherry picked from commit 6018d048)