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

http://www.doctrine-project.org/jira/browse/DDC-2475