Merge branch 'feature/pmitros/rework-probe' of github.com:edx/djanalytics into feature/pmitros/rework-probe