Revert "Merge branch 'release_3.0.0' into devel"

This reverts commit 3cedfe6c679e5b289bd0a27defb6198d063ba8e8.

requirements/requirements.txt

@@ -5,7 +5,7 @@ appdirs==1.4.0
 azure==2.0.0rc2
 Babel==2.2.0
 billiard==3.3.0.16
-boto==2.40.0
+boto==2.39.0
 celery==3.1.10
 cliff==1.15.0
 cmd2==0.6.8
@@ -51,7 +51,6 @@ jsonpointer==1.10
 jsonschema==2.5.1
 keyring==4.1
 kombu==3.0.30
-apache-libcloud==0.20.1
 lxml==3.4.4
 Markdown==2.4.1
 M2Crypto==0.22.3
@@ -100,11 +99,12 @@ python-novaclient==3.2.0
 python-openid==2.2.5
 python-openstackclient==2.0.0
 python-radius==1.0
-python-saml==2.1.8
+python-saml==2.1.4
 git+https://github.com/matburt/python-social-auth.git@master#egg=python-social-auth
 python-swiftclient==2.7.0
 python-troveclient==1.4.0
 pytz==2015.7
+pywinrm==0.1.1
 PyYAML==3.11
 pyzmq==14.5.0
 rackspace-auth-openstack==1.3

requirements/requirements_ansible.txt

@@ -3,7 +3,7 @@ apache-libcloud==0.20.1
 appdirs==1.4.0
 azure==2.0.0rc2
 Babel==2.2.0
-boto==2.40.0
+boto==2.34.0
 cliff==1.15.0
 cmd2==0.6.8
 cryptography==1.3.2
@@ -61,7 +61,7 @@ python-openstackclient==2.0.0
 python-swiftclient==2.7.0
 python-troveclient==1.4.0
 pytz==2015.7
-pywinrm[kerberos]==0.2.0
+pywinrm==0.1.1
 PyYAML==3.11
 pyzmq==14.5.0
 rackspace-auth-openstack==1.3