Fixes for the RPM caching branch

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>