[Merge] lp:~barry/ubuntu-system-image/citrain-250u1 into lp:~ubuntu-managed-branches/ubuntu-system-image/system-image

[Barry Warsaw]

The proposal to merge lp:~barry/ubuntu-system-image/citrain-250u1 into lp:~ubuntu-managed-branches/ubuntu-system-image/system-image has been updated.

Commit Message changed to:

Fixes for LP: #1369717 and LP: #1370586

For more details, see:
https://code.launchpad.net/~barry/ubuntu-system-image/citrain-250u1/+merge/236403
-- 
https://code.launchpad.net/~barry/ubuntu-system-image/citrain-250u1/+merge/236403
Your team Ubuntu CI managed package branches is requested to review the proposed merge of lp:~barry/ubuntu-system-image/citrain-250u1 into lp:~ubuntu-managed-branches/ubuntu-system-image/system-image.