Fix bug 1033682 - encode model ids when generating broker urls