Fix bug 1033682 - encode model ids when generating broker urls
Merge pull request #4229 from liggitt/bug_1033682_id_uri_escaping

Merged by openshift-bot