Ensured that OrderedDict is imported on python 2.6/2.7

The server is OK without this, but we need it for local unit tests