Merge "Adding trust-store and trust-store-password params"