Changing server url for manuel test
Removing truststore file, as openshift got fixed
Solve conflicts