Intent to backport OAK-7131 (xpath to sql2 conversion drops order by clause for some cases)

[Thomas Mueller]

I want to backport OAK-7152 to all maintenance branches. The fix is simple and 
low risk.

Regards,
Thomas