Correctly combine URI/Entity Namespace on ValueSetDefinition.