Rawhide almost back to Master.

[Carlos O'Donell]

I'm in the process of flipping rawhide back to master, but
that failed unexpectedly by a compiler warning build failure
on aarch64, armv7hl, and s390x.

I should have that retested and fixed shortly. This way
next week we can resume master->rawhide weekly rebases.

-- 
Cheers,
Carlos.