Merge pull request #2424 from opscode/sersut/chef-2356

:auto mode for :file_staging_uses_destdir
Merge pull request #2440 from opscode/sersut/port-destdir-auto

Merge pull request #2424 from opscode/sersut/chef-2356