Fixed AIRAVATA-1367 for SGE. Its defined as UGE
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Cleaned up the imports.