Fixed the streams and the imports issues

Fixed the issues with the streams and with the imports and space

Issue-ID: DCAEGEN2-1517
Change-Id: I856f1fa3fc47faea19388096f739519db0fe41d8
Signed-off-by: ms236b <ms236b@att.com>
6 files changed