Various changes to complete 0.12.0 build on F20
(may need to inspect actual upstream tarball for deltas)