Merge "Switch Elasticsearch and Kibana classes to 5 version"