Merge "Add truststore merger csits job"