Test for get_parent across branches
Merge pull request #6367 from edx/dhm/tnl_1012

Test for get_parent across branches