generates a workspace instead of subproject

Initial part of [CB-5921](https://issues.apache.org/jira/browse/CB-5921)
This line is also not necessary and causes warnings.