This has been changed again to prevent the tool deployer code failing during the update
Now all innodb alterations and adding contraints required for LDEV-1511 are done in this one script, in lams common alter_21_engine.sql which is allowed to fail.
LDEV-1511 use original constraint names for consistency, and so that we don't get multiple constraints on the same keys if the tables happen to already be innodb and have their constraints (i.e. script failure is ok in this case)