This is the last patchset rebased against the current
HEAD and updated to incorporate mtaylor's feedback 
Vit submitted the backports  gem to Fedora for review. I will
look at taking this up (if noone gets to this first) but until
it's in, am still relying on the manual path workaround in our codebase.