Merge "Add default for infra_config_deploy_address in the new stacks"