Refactored to remove deprecated CarbonContext API methods
Merge remote-tracking branch 'wso2-dev-product-greg/master' into dev