Merge "Add OS_TOP_LEVEL to testr conf"