Automatic merge from submit-queue

Adding support for upgrading testing across image types.

Adds support for upgrade testing across image types.

@spxtr @vishh @ixdy @pwittrock

This change only affects upgrade testing. This does not touch production code and hence should be safe for cherrypicks into the 1.4 release branch.