apache2 config
Merge branch 'feature/ubuntu_kdeploy' of github.com:stephaneb/chef-applications into feature/ubuntu_kdeploy

* 'feature/ubuntu_kdeploy' of github.com:stephaneb/chef-applications:
  metadata
  apache acl nscd

Conflicts:
	metadata.rb