[WIP] Fix F26 build.

[Carlos O'Donell]

Arjun,

Attached is my WIP patch to fix the f26 build.

Would you mind running with this patch?

* Build locally and check it fixes things (mockbuild)
* Scratch build for all arches, and double check no testsuite regression.
* File a fedora bug for this and use the bug number for the fix.
* Post final patches here (public [e-mail]) for review.
* Start running through the bodhi process to update f26 with this fix.

Thanks!

Mike,

This should unblock you from using f26.