Moved some database upgrades out of AMDatamanAppControllerForActions3, which will be removed shortly anyway. Made some cosmetic changes to other classes.