Merge "Fix OS_TEST_PATH in .testr.conf"