Cleaning up messes from hurried upstream merge

@stvstnfrd these are the fixes we talked about. I remove the commented-out lines from access.py and the tests, and I restore 'edx_sga' to the CMS advanced components. This should put us ahead of current release by the difference of the commented-out-line removals.