conflict with not running test fixed
conflict with not running test fixed

osiam/connector4java-integration-tests,tkrille/osiam-connector4java-integration-tests,dacrome/connector4java-integration-tests,tkrille/osiam-connector4java-integration-tests,dacrome/connector4java-integration-tests,wallner/connector4java-integration-tests,tkrille/osiam-connector4java-integration-tests,osiam/connector4java-integration-tests