Updated ciKeyStore with new certificate
Uploading new ciKeyStore.jks
Another new ciKeyStore.jks
Updating local KeyStore
IS-837 Update wildcard certificate to self signed
IS-837 updating trust store with self signed cert
IS-837 put the cert in all the places
Merge branch 'master' into ssl_error

Conflicts:
	sli/data-access/dal/keyStore/ciKeyStore.jks
Merge branch 'master' into ssl_error
fixed error in api odin test