Merge pull request #998 from hurtonm/master

Don't add empty metadata to received messages
Include ZMTP properties in message metadata

Metadata are built in stream_engine now.
This makes it easy to extend metadata with user-defined properties.