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

OOIION-1378: StreamConfiguration stores type of stream