Fix DDC-2475
Merge pull request #686 from FabioBatSilva/DDC-2475

[DDC-2475] Replace OrderBy mapping when OrderByClause is given