generates a workspace instead of subproject

Initial part of [CB-5921](https://issues.apache.org/jira/browse/CB-5921)
It seems that here, and in a number of places above, the indentation differs from the rest of the file.