Merge "Pin the ES/Kibana to 5.x as a current one"