revert merge
Merge branch 'trbm/hints_PR' of https://github.com/edx/edx-platform into trbm/hints_PR

* 'trbm/hints_PR' of https://github.com/edx/edx-platform:
  sync hints and hints_PR branches
  deleting blanks lines
  delete some left over commented code
  cherry pick conflict correction: 1a
  cherry pick conflict correction: 1
  squashing in preparation for PR submission