Sync wso2-dev to wso2 

Change spring version