Fix/vik/pg hotfix

Cherry pick commits from https://github.com/edx/edx-platform/pull/961 , https://github.com/edx/edx-platform/pull/955 , and https://github.com/edx/edx-platform/pull/889 for hotfix.