Setup keystore during integration tests#22966

Merged

Tim-Brooks merged 12 commits intoelastic:masterfrom

Tim-Brooks:keystore_work

Mar 20, 2017

Commits on Feb 2, 2017

Commits on Feb 21, 2017

Fix a number of issues that came up from review
Tim-Brooks
committed

Commits on Feb 22, 2017

Merge remote-tracking branch 'upstream/master' into keystore_work
Tim-Brooks
committed

Commits on Mar 20, 2017

Merge remote-tracking branch 'upstream/master' into keystore_work
Tim-Brooks
committed