Rebase fix.
Added docstring to TestFindAttempted
Removed old argument related to projected grades`
Reverted accidental deletion of line.
Merge branch 'csvoss/refactor-grades' of github.com:edx/edx-platform into csvoss/refactor-grades