Merge "logstash replicaset 5 to 3 and 1 dev.yaml"