When combining two schemas field names can change so we need to also return a mapping between the old field names and the new ones.  Also add options for changing the postfix characters.
Upgrade to Groovy 1.8.9 which fixes Groovlets!