Fix #2107 part 2: Now uses the same ordering type in J!2.5 and J!3.0
Revert #2088: It breaks layout in a few tested templates
Merge pull request #2119 from mahagr/master

Fix ordering in plugin manager part 2