Refactor upgrade controller for rerun and analytics support
Upgrade fixes
Upgrade fixes
Fix existing platform upgrade tests