Test and fix for ordering with belongsTo includes
Change some tests, break BC
Try to maintain BC
Attempt to restore BC
Attempt to restore BC
restore BC
Merge pull request #1189 from mickhansen/include-order-fix

Fix for order by when you only have 1:1 includes