Updated from global requirements

Change-Id: I2fa1b6a56bc1c60d7d847f2526d5f1e408099de3

requirements.txt

@@ -1,21 +1,21 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr>=1.6
+pbr>=1.6 # Apache-2.0
 
-eventlet>=0.17.4
-httplib2>=0.7.5
-netaddr!=0.7.16,>=0.7.12
-SQLAlchemy<1.1.0,>=1.0.10
-alembic>=0.8.0
-six>=1.9.0
+eventlet>=0.17.4 # MIT
+httplib2>=0.7.5 # MIT
+netaddr!=0.7.16,>=0.7.12 # BSD
+SQLAlchemy<1.1.0,>=1.0.10 # MIT
+alembic>=0.8.0 # MIT
+six>=1.9.0 # MIT
 oslo.config>=3.2.0 # Apache-2.0
 oslo.db>=4.1.0 # Apache-2.0
 oslo.log>=1.14.0 # Apache-2.0
 oslo.messaging!=2.8.0,!=3.1.0,>2.6.1 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.service>=1.0.0 # Apache-2.0
-oslo.utils>=3.2.0 # Apache-2.0
+oslo.utils>=3.4.0 # Apache-2.0
 
 # This project does depend on neutron as a library, but the
 # openstack tooling does not play nicely with projects that

test-requirements.txt

@@ -3,18 +3,18 @@
 # process, which may cause wedges in the gate later.
 hacking<0.11,>=0.10.0
 
-coverage>=3.6
-fixtures>=1.3.1
-mock>=1.2
-python-subunit>=0.0.18
+coverage>=3.6 # Apache-2.0
+fixtures>=1.3.1 # Apache-2.0/BSD
+mock>=1.2 # BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
 requests-mock>=0.7.0 # Apache-2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 oslo.concurrency>=2.3.0 # Apache-2.0
-testrepository>=0.0.18
-testtools>=1.4.0
-testscenarios>=0.4
-WebOb>=1.2.3
-WebTest>=2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+testscenarios>=0.4 # Apache-2.0/BSD
+WebOb>=1.2.3 # MIT
+WebTest>=2.0 # MIT
 oslotest>=1.10.0 # Apache-2.0
 reno>=0.1.1 # Apache2