Changes necessary to satisfy JIRA issues STREAMS-75,76,77

for URL unwinder capabilities.