Fix handling of uninstall and deploy of CustomLabels
Merge branch 'feature/215-ant-update-metaxml' of github.com:SalesforceFoundation/Cumulus into feature/215-ant-update-metaxml