CLC-3548 Apply data translation layer to SakaiData and Oec query classes