merging brach commits r173601 and r173595

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@175303 a5903396-d722-0410-b921-86c7d4935375
Fixing integration pom issue 

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