edx/edx-platform — pull request #4369 by dmitchell (2014-07-10 15:57:58+00:00)
Title: Bug/stud 1962

@cahrens please review

@nasthagiri managing version conflict errors while keeping them when we need them may require another context manager or some other mechanism. (see all of the for_version stuff in the new test code)