Merge "[AAI] Fix truststore password to avoid exceptions" into honolulu