Fix issue with console output hanging
EUCA-4545
Merge branch 'dev/chuck/EUCA-4545-2' into maint/3.3/testing