rename AiravataServer as AiravataAPIServer 
https://issues.apache.org/jira/browse/AIRAVATA-1046
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
https://issues.apache.org/jira/browse/AIRAVATA-1047
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
https://issues.apache.org/jira/browse/AIRAVATA-1046