edx/edx-platform — pull request #4805 by zubair-arbi (2014-08-13 12:35:18+00:00)
Title: update get_parent_location method to select non-orphan parents from mult...

...iple parents

STUD-2007