pushing 3.7.1 fixes to wso2 master