Refactor code, add test case for masquerade mode
Add comments, rename variables to be more meaningful
Merge branch 'master' into Issue1852
[1852] Clean up InstructorCourseEnrollPageAction

fixes #1852