Fixing trustStore issues in AAI Client