Move common code in normalize_manifest to a method.
Merge pull request #168 from mmb/manifest_hash_values

Move common code in normalize_manifest to a method.