Update staging
restore
Revert "restore"

This reverts commit 8f34035ff819da53692940cb96cc66903bab87cd.
Revert "Update staging"

This reverts commit 7e80a6357ee03c11548bd57187cacd60746470cb.
Merge branch 'ordering-admin-default' of https://github.com/JoomliC/joomla-cms into ordering-admin-default