Merge wso2-dev product-is changes to wso2 repo

Merge wso2-dev product-is changes to wso2 repo