Merge branch 'mvo/update_bok_choy_db_caches' of…

Merge branch 'mvo/update_bok_choy_db_caches' of https://github.com/edx/edx-platform into mvo/update_bok_choy_db_caches