Nick/jeff squash fixedup#1995

nparlante wants to merge 2 commits into

masteropenedx/openedx-platform:masterfrom

nick/jeff-squash-fixedupopenedx/openedx-platform:nick/jeff-squash-fixedupCopy head branch name to clipboard