fixing a conflict issue in worker side
Merge fix for worker node git conflict Merge branch 'master' of https://github.com/wso2/private-paas