Merge branch 'master' into threadSupportForRouter

Conflicts:
	modules/siddhi-loadbalancer/src/main/java/org/wso2/siddhi/loadbalancer/nodemanager/NodeProvider.java
	modules/siddhi-loadbalancer/src/main/java/org/wso2/siddhi/loadbalancer/utils/KeyStoreUtil.java