[streaming] Fix LICENSE file for streaming project. Minor merge fixes.

This closes #72