CB-8000 Fix --usegit option when adding windows and wp8

https://issues.apache.org/jira/browse/CB-8000