Bug 21942: Clean up cataloging merge template

Bug 21942: Clean up cataloging merge template

This patch makes a few minor markup corrections to the cataloging merge
template:

 - Remove invalid "type" attributes from <style> and <script>
 - Add missing closing </span>
 - Remove obsolete YUI grid markup

To test, apply the patch and test the process of merging records in
Cataloging. Everything should look correct and work correctly.
Validating the HTML source should return no errors stemming from the
template.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>