fix DEG bug with emitting string constants
Merge branch 'develop' into develop-dmz
fixed flatMap codegen bug; added test case