Merge "Bug 453 - sal-rest-connector doesn't provide stream discovery feature"