Minor cleanups in upgrade code

[drevell]

• Wrap parameters to commit() in a commitParams{} struct for commentability and to avoid a huge function declaration
• Add comments to various functions for maintainability
• Resolve one testing TODO about the manifest path by ensuring the same path is used to load the manifest before and after upgrading