Merge "Let branch determine pup-odl tests to run"