[Merge] lp:~corey.bryant/keystone/2014.1.4 into lp:~ubuntu-server-dev/keystone/icehouse

[James Page]

As we skip this part of the test suite:

# only for Keystone tests running against keystoneclient master
oslo.serialization>=0.1.0,<1.1               # Apache-2.0

I think we're probably OK without it.

Testing now.
-- 
https://code.launchpad.net/~corey.bryant/keystone/2014.1.4/+merge/253112
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~corey.bryant/keystone/2014.1.4 into lp:~ubuntu-server-dev/keystone/icehouse.