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

Conflicts:
	spec/unit/node_spec.rb

/cc: @lamont-granquist