Merge remote-tracking branch 'origin/master'

Conflicts:
	siddhi-hive-component/org.wso2.carbon.siddhihive.core/src/main/java/org/wso2/carbon/siddhihive/core/internal/SiddhiHiveManager.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	siddhi-hive-component/org.wso2.carbon.siddhihive.core/src/main/java/org/wso2/carbon/siddhihive/core/internal/SiddhiHiveManager.java