UTG

Merge commit 'ab1ebdcb842505b6b4838151b59e0834b976c897' into UP-173-move-the-composite-code-from-measure-type-to-measure-scoring

# Conflicts:
#	input-cache/txcache/EPSG-GeodeticParameterDataset.cache
#	input-cache/txcache/MSH.cache
#	input-cache/txcache/SCDHEC-GISSpatialAccuracyTiers.cache
#	input-cache/txcache/all-systems.cache
#	input-cache/txcache/appointment-cancellation-reason.cache
#	input-cache/txcache/epsg-ca.cache
#	input-cache/txcache/epsg-crs.cache
#	input-cache/txcache/http___ncithesaurus-stage.nci.nih.gov.cache
#	input-cache/txcache/https___www.cdc.gov_nhsn_cdaportal_terminology_codesystem_hsloc.html.cache
#	input-cache/txcache/https___www.cms.gov_Medicare_Coding_HCPCSReleaseCodeSets.cache
#	input-cache/txcache/icd9cm.cache
#	input-cache/txcache/iso3166-2.cache
#	input-cache/txcache/loinc.cache
#	input-cache/txcache/naics.cache
#	input-cache/txcache/nubc-UB92.cache
#	input-cache/txcache/service-category.cache
#	input-cache/txcache/service-type.cache
#	input-cache/txcache/ucum.cache
#	input-cache/txcache/v2-0350.cache
#	input-cache/txcache/v2-0351.cache
#	input-cache/txcache/v2-0456.cache
#	input-cache/txcache/v2-0895.cache
#	input-cache/txcache/v3-ActClass.cache
#	input-cache/txcache/v3-RoleClass.cache
#	input/utg.xml