Optimize ORDER BY out when salted if order preserving, fix associated unit tests
Bug fix for forcing scan to run through skip scan