Bug 21942: Clean up cataloging merge template