OOIION-1378: StreamConfiguration stores type of stream
Merge pull request #431 from mmeisinger/fix1378_pre2_r2

OOIION-1378: StreamConfiguration stores type of stream