Merge proposals dependent on lp:~jeremywootten/pantheon-files/fix-1511307-restore-sort-order

1. fix-1511307-restore-sort-order
2. Dependent merge proposals