TRUNK-3974: ConceptNumeric(concept) incorrectly copies collections
Merge pull request #535 from lrozanski/TRUNK-3974

TRUNK-3974: ConceptNumeric(concept) incorrectly copies collections
TRUNK-3898: Retired and hidden ConceptMapTypes should be at the end of the list
Merge pull request #547 from lrozanski/TRUNK-3898

TRUNK-3898: Retired and hidden ConceptMapTypes should be at the end of the list