fixed more cpp stream bugs
Merge branch 'wip-clusters2' of github.com:stanford-ppl/Delite into wip-clusters2