Merge remote-tracking branch 'origin/dev' into dev

requirements/requirements.txt

 amqp==2.1.4
-six==1.11.0
 ansible==2.4.2.0
 asn1crypto==0.24.0
 bcrypt==3.1.4
 billiard==3.5.0.3
+boto3==1.6.4
+botocore==1.9.4
 celery==4.1.0
 certifi==2017.11.5
 cffi==1.11.2
 chardet==3.0.4
+configparser==3.5.0
 coreapi==2.3.3
 coreschema==0.0.4
 cryptography==2.1.4
@@ -15,6 +17,7 @@ decorator==4.1.2
 Django==1.11
 django-auth-ldap==1.3.0
 django-bootstrap3==9.1.0
+django-celery-beat==1.1.1
 django-filter==1.1.0
 django-formtools==2.1
 django-ranged-response==0.2.0
@@ -23,15 +26,22 @@ django-rest-swagger==2.1.2
 django-simple-captcha==0.5.6
 djangorestframework==3.7.3
 djangorestframework-bulk==0.2.1
+docutils==0.14
 ecdsa==0.13
+elasticsearch==6.1.1
 enum-compat==0.0.2
+ephem==3.7.6.0
 eventlet==0.21.0
 ForgeryPy==0.1
 greenlet==0.4.12
+gssapi==1.2.4
+gunicorn==19.7.1
 idna==2.6
 itsdangerous==0.24
 itypes==1.1.0
 Jinja2==2.10
+jmespath==0.9.3
+jms-es-sdk
 kombu==4.0.2
 ldap3==2.4
 MarkupSafe==1.0
@@ -46,18 +56,16 @@ pycparser==2.18
 pycrypto==2.6.1
 pyldap==2.4.45
 PyNaCl==1.2.1
+python-dateutil==2.6.1
+python-gssapi==0.6.4
 pytz==2017.3
 PyYAML==3.12
 redis==2.10.6
 requests==2.18.4
+s3transfer==0.1.13
 simplejson==3.13.2
+six==1.11.0
 sshpubkeys==2.2.0
 uritemplate==3.0.0
 urllib3==1.22
 vine==1.1.4
-gunicorn==19.7.1
-#https://github.com/celery/django-celery-beat/zipball/master#egg=django-celery-beat
-django_celery_beat==1.1.1
-ephem==3.7.6.0
-python-gssapi==0.6.4
-jms-es-sdk