Allow env vars in stream URLs
Merged from master