* Restore the temporary use of edx_sga to our CMS advanced components
  list
* Uncomment lines commented out (and then forgotten) during unit test
  debugging