add --fork for chef >=10.14
Merge branch 'fork'
Merge branch 'fork'

Conflicts:
	attributes/default.rb
	recipes/service.rb
good options chef-client in upstart section

add --fork for arch
Merge remote-tracking branch 'upstream/master'

Conflicts:
	recipes/service.rb
fix service and task recipes for CHEF-1804
[COOK-635] Regression of RedHat init script

This seems to have been clobbered a while back in https://github.com/opscode/cookbooks/commit/78d8d57c087c55759ad9ba3365213ab15349276a
[COOK-1861] Minor style change for consistency
[COOK-1862] Adds name parameter to metadata.rb
[COOK-1664] Adds permissions handling to cron recipe

This follows the behavior of COOK-599, COOK-985 in setting the correct
permissions of the directories based on whether the system is also a chef-server.
Merge pull request #32 from opscode-cookbooks/CHEF-1804-compat

fix service and task recipes for CHEF-1804
Merge pull request #34 from miketheman/COOK-1861

[COOK-1861] Minor style change for consistency
Merge pull request #35 from miketheman/COOK-1862

[COOK-1862] Adds name parameter to metadata.rb
Merge pull request #33 from miketheman/COOK-635

[COOK-635] Regression of RedHat init script
COOK-1574 Fix root_user on Windows
Merge branch 'COOK-1574'
COOK-1788 - Fix Ubuntu only logic.

Start with /etc/init and .conf. Switch when we use
an older version of Ubuntu.
COOK-1788 - add missing end
Merge branch 'COOK-1788'
update tests for newer minitest and test kitchen