Merge branch 'master' of https://github.com/inshafmahath/ESBConnectors

Conflicts:
org.wso2.carbon.connector/.idea/workspace.xml
Merge branch 'master' of https://github.com/inshafmahath/ESBConnectors

Conflicts:
	org.wso2.carbon.connector/.idea/workspace.xml