Merge "[DCAEGEN2] Rename truststore-merger"