Changed the fix deployment code to handle inconsistencies properly.
XXMerge branch 'master' of github.com:wso2-dev/carbon-business-process