Fixing https://wso2.org/jira/browse/CDEPLOY-14
Fixing https://wso2.org/jira/browse/CDEPLOY-14

jsdjayanga/carbon-deployment,Shakila/carbon-deployment,wso2/carbon-deployment,thusithathilina/carbon-deployment