APPLIED: [PATCH 0/2][SRU][E] Fixes for i386 arch removal patches

[Seth Forshee]

On Mon, Sep 30, 2019 at 09:47:43AM -0500, Seth Forshee wrote:
> BugLink: https://bugs.launchpad.net/bugs/1845714
> 
> These are some additional patches needed to get final-checks passing
> once the i386 directory has disappeared from the abi, while maintaining
> the ability to keep the i386 configs updated. Submitting under the same
> bug number as the original patches since they have not yet made it to
> -proposed.

Applied to eoan/master-next.