Changes to enable building with firestack

The below series of changes enable firestack to build heat packages on fedora 19 for me