Fix Rawhide support

Change-Id: I7d1748b01600ee2ce968e2485d6de57b0b95417e
Fixes: rhbz#995872
Merge "Fix Rawhide support" into grizzly