Remove first line of _merge template "-*- coding..." that was breaking the javascript when it was loaded via ajax.
Add basic selenium test for merging enumerations
Merge pull request #704 from hudmol/fix-enumeration-merge

[Delivers #66535718]  Fix enumeration merge