Merge "Conform start_tests.sh to last ODL patches"