support local user management via data bag
Merge branch 'master' of https://github.com/Webtrends/rundeck

Conflicts:
	recipes/server.rb
Merge branch 'master' of https://github.com/Webtrends/rundeck
merge conflicts
attributes fix
Merge branch 'master' of https://github.com/Webtrends/rundeck

Conflicts:
	CHANGELOG.md
	attributes/default.rb
	templates/default/jaas-activedirectory.conf.erb
Merge branch 'master' of https://github.com/Webtrends/rundeck
rundeck package bump and ldap settings for supplemental group fix to
https://github.com/rundeck/rundeck/issues/590