Imported all the in-production changes from vcap-common
rspec already covered in gemspec
Ensure loading cf/registrar from local src