Updated from global requirements

Change-Id: I9c576388ddd5882e82adfb20b9097fe2979b1fb2

requirements.txt

@@ -1,10 +1,10 @@
 pbr>=0.6,!=0.7,<1.0
 argparse
-cliff>=1.4.3
+cliff>=1.6.0
 iso8601>=0.1.9
 netaddr>=0.7.6
 requests>=1.1
 python-keystoneclient>=0.9.0
 simplejson>=2.0.9
-six>=1.6.0
+six>=1.7.0
 Babel>=1.3

test-requirements.txt

@@ -6,6 +6,6 @@ discover
 fixtures>=0.3.14
 mox>=0.5.3
 python-subunit>=0.0.18
-sphinx>=1.1.2,<1.2
+sphinx>=1.1.2,!=1.2.0,<1.3
 testrepository>=0.0.18
 testtools>=0.9.34