Merge "fix truststore builder script"