merging all the clustering related fixes done by me, into trunk

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@175178 a5903396-d722-0410-b921-86c7d4935375
adding a missed commit

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@175180 a5903396-d722-0410-b921-86c7d4935375