Merge branch 'aes_security' of github.com:mbakke/puppet-mcollective into merge/PR23

Conflicts:
	manifests/client.pp
	manifests/init.pp
	manifests/node.pp