Update for latests EDX Platform changes, Sept. 18
Revert "Update for latests EDX Platform changes, Sept. 18"

This reverts commit ce573fbe3aed821d12660825168282b523a2be01.
Update September 18

Fixed issues due to EDX Platform latest updates