Merge "Add ODL noHA testcase"