Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul""

This reverts commit 079808ee474031e47ed7c83a61b407e5ab5bb7ab.
Fix instructor dashboard analytics