Merge "Stop raising keystoneauth1 exceptions in odl unit tests"