Merge "Get rid of py26 references: OrderedDict, httplib, xml testing"

diff --cc neutron/tests/base.py
index 07914f531e04412413fc3ef00b2d61772b624680,420c8ed9d5f46f1646c50c38857a44ca1180b99d..56678fe7b59c91d4713b438588001d887571f5c8
--- 1/neutron/tests/base.py
--- 2/neutron/tests/base.py
+++ b/neutron/tests/base.py
@@@ -25,9 -25,9 +25,8 @@@ errors due to duplicate configuration d
  
  import logging as std_logging
  import os.path
- import sys
  
  import fixtures
 -import mock
  from oslo.config import cfg
  from oslo.messaging import conffixture as messaging_conffixture
  

diff --cc neutron/tests/unit/agent/linux/test_ovs_lib.py
Simple merge