updating to use the existing gateway id
updating to increase the retries + refactor test code
reintroduce integration tests
updating the warn message
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata