Merge "Switch Elasticsearch and Kibana to 5 version"