attempt to make the stream message facade interface more usable.
Merge branch 'master' into amqp-only