FIX: cleanMetadataCatalog signature

The signature was not right
Merge pull request #1313 from sposs/patch-44

FIX: cleanMetadataCatalog signature
v6r6p21
Conflicts resolved after merging with rel-v6r6
v6r7p13
Merge remote-tracking branch 'upstream/rel-v6r7' into rel-v6r7