acu118468 bump chef to 11.6.0
acu118468 disable forking for Chef::Client in Chef 11
acu118468 return json dependency
acu118468 - set lockfile to prevent thread lock for concurrent recipes execution
Merge branch 'master' into ivory_13_14_acu118468_bump_chef

Conflicts:
	Gemfile
	Gemfile.lock
acu129241 delete deprecated cloud plugins
acu129241 combine rackspace definitions and delete rackspace-ng
acu129241 rename google -> gce
Merge branch 'ivory_13_15_acu129241_rs_ohai_plugins_v6.0_rax' into ivory_13_15_acu129241_rs_ohai_compatibility
Merge branch 'ivory_13_15_acu129241_rs_ohai_plugins_v6.0_gce' into ivory_13_15_acu129241_rs_ohai_compatibility
acu129241 unify rightscale cloud plugin output with vanilla ohai cloud plugin
acu129241 remove unsupported cloud defenition
Merge branch 'ivory_13_14_acu118468_bump_chef' into ivory_13_15_acu129241_rs_ohai_compatibility
acu129241 fix openstack provider value
acu129241 keep specs green
Merge pull request #258 from rightscale/ivory_13_15_acu129241_rs_ohai_compatibility

Make RightScale's ohai cloud plugin compatible with vanilla ohai version