Updated from global requirements

Change-Id: Icdee08fa079eb3646388567050643c29eac1eca8

Author: OpenStack Proposal Bot

requirements.txt

@@ -5,7 +5,7 @@ pbr>=1.6 # Apache-2.0
 six>=1.9.0 # MIT
 
 Babel>=1.3 # BSD
-cliff>=1.15.0 # Apache-2.0
+cliff!=1.16.0,>=1.15.0 # Apache-2.0
 keystoneauth1>=2.1.0 # Apache-2.0
 openstacksdk>=0.7.4 # Apache-2.0
 os-client-config>=1.13.1 # Apache-2.0

test-requirements.txt

@@ -6,7 +6,7 @@ hacking<0.11,>=0.10.0
 coverage>=3.6 # Apache-2.0
 discover # BSD
 fixtures>=1.3.1 # Apache-2.0/BSD
-mock>=1.2 # BSD
+mock>=1.2;python_version<'3.3' # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 reno>=0.1.1 # Apache2