Merge pull request #2097 from opscode/lcg/chef-12-attr

Lcg/chef 12 attr
Conflicts:
	spec/unit/node_spec.rb
Merge pull request #2386 from opscode/sersut/12-attr-port

Merge pull request #2097 from opscode/lcg/chef-12-attr