LDEV-1825: When we copy a learning design, make sure any grouping details and associated mappings attached to a teacher chosen branching or a define later grouped branching are not copied. If we don't do this, we encounter problems when run a design that has been attached to a lesson. Otherwise we either throw an exception (as the grouping doesn't exist) or we use the groupings that were used in the previous lesson and they may not be wanted.
LDEV-1613 Defined two seperate link options in author one for wiki links and the other for external links, instead of just one single option. Fixed up editing option condition for max num edits per wiki page
For LDEV-1511 and LDEV-1702- Update locales adds the Japanes language to the list iff it doesnt already exist- update-core-database allows alter_21_engine.sql to fail, as tables may already be innodb and they may already have their foreign keys listed
Updated ant tasks to not generate new deploy.xmls (for tool deployer) but instead use the new ones generated by Fiona's changes and simply replace the configuration-specific items using ant's filter
Fixed up reverter for 2.1, previously, the revert.exe file was being run from the user's install dir, which was subsequently overwritten - causing an error. Copy is now done using ant, and the revert.exe is not overwritten
