Revert "Merge branch 'staging' of github.com:manojLondhe/joomla-cms into listviews"

This reverts commit eda0cb989a664f5769ce8951d5014e92639f9be4, reversing
changes made to fce4d9727227baf617a3e35d24b145cda0021822.