Fix for display of sort arrow on sortable table headings
Revert "Fix for display of sort arrow on sortable table headings"

This reverts commit a4325d51e9587a0627b985d7f0851d1d87285fd7.
Fix for display of sort arrow on sortable table headings
Merge branch 'os1' into develop