Allow mixing of catalogs, and use catalogId to resolve name conflicts#2020

wrenj wants to merge 10 commits into

maina2ui-project/a2ui:mainfrom

namespaca2ui-project/a2ui:namespacCopy head branch name to clipboard