Adds a new upgrade script to fix some leftover permission problems from the 2.2.0 upgrade where we trimmed the controller names but sometimes failed to update the permissions entries, therefore the permissions won't work properly.  Also cleaned up the upgrade container2 script to run correctly now.