Support ElasticSearch version 5#4

umrashrf wants to merge 2 commits into

tk0miya:mastertk0miya/testing.elasticsearch:masterfrom

umrashrf:masterumrashrf/testing.elasticsearch:masterCopy head branch name to clipboard