Merge branch 'github__upstream_master' into github_upstream_search-guard

* github__upstream_master:
  Revert "Merge pull request #22 from r4j4h/search-guard"

Conflicts:
	Dockerfile

Dockerfile

@@ -2,6 +2,7 @@ FROM alpine:3.6
 
 RUN apk --no-cache add python py-setuptools py-pip gcc libffi py-cffi python-dev libffi-dev py-openssl musl-dev linux-headers openssl-dev libssl1.0 && \
     pip install elasticsearch-curator==5.4.0 && \
+    pip install boto3 && \
     pip install requests-aws4auth==0.9 && \
     pip install cryptography==2.1.3 && \
     apk del py-pip gcc python-dev libffi-dev musl-dev linux-headers openssl-dev && \