Update upgrade CLI to handle containers
config correctly
#16169
Merged
Loading
containers
config correctly
#16169