added /organizations/<org>/controls endpoint
Overwrite chef-server.rb with private-chef.rb if former is empty
Added -p.  Not needed for parent directories, but suppresses error if dir exists.
Merge branch 'dt/fix-upgrade-conflict'
Updated chef-server-ctl password to use knife opc.
Bump knife-opc to 0.2.1.
Updated changelog.
Merge pull request #589 from opscode/tc/fix-password-cmd

Fix `chef-server-ctl password` command.
Add a note about the switch to chef-server.rb to changelog, releasenotes

With Chef Server 12, /etc/opscode/chef-server.rb is the place for server
configuration and /etc/opscode/private-chef.rb is deprecated. Note this
in the changelog and release notes.
Merge branch 'mm/changelog-for-chef-server-rb'
Merge pull request #594 from opscode/dp_controls

added /organizations/<org>/controls endpoint
Making postgres effective_cache_size match the documentation

- https://docs.getchef.com/config_rb_chef_server_optional_settings.html
- The docs mention that the default effective_cache_size is 50% of total
  RAM, but the code hardcoded things to 128MB
Update changelog for postgres effective_cache_size change
Merge branch 'mm/effective_cache_size_master'
[OC-11712] Allow Group to Read Logfiles

* Change log_dir perms to 0750 all over
* Set perms for postgresql explictly
* Change perms to single quotes
Adjust group usage for log dirs

* Add an OmnibusHelper method to provide an owner and group hash
* Reference owner and group for log dirs in recipes where only owner is found
* Fix other recipe locations referencing node['private_chef']['user']['username'] directly
Merge branch 'sh/fix-logdir-perms-master-take2'
Respect the max shared mem lists for postgresql.  Issue #597
Merge branch 'jm/597' PR #598

Respect shared mem limits
pedant 1.0.64 and erchef 0.29.2

* changelog updates for the above, and formatting corrections
* brought release notes up to date with latest changes, made minor
  formatting changes to consolidate information.
* readme updates for the above