Merge pull request #5104 from aparcar/attendedsysupgrade-common