Fix #1528 : Restrict collection ordering on available collections
Merge pull request #689 from romainneutron/fix-1528

[3.8] Fix #1528 : Allow collection order only on available collections