CSPACE-5947,CSPACE-5948: Document types are now unqualified before looki...

...ng up services bindings or URI templates.