1014827: Fixing unit_key and unit_metadata
Merge pull request #3084 from daviddavis/temp/20131003125249

1014827: Fixing unit_key and unit_metadata values