Moved code from AddContainerStep to ContainerSetupWizard
Upgrade Forge version