25527 Add upgrade testing for 7.x-1.x branch