Bump the version number to 11.10.0.alpha.0.
Add pry as a runtime dependency
remove commented pry dep from Gemfile
Merge branch 'pry-it-up'

Fixes CHEF-4648 https://tickets.opscode.com/browse/CHEF-4648
Fix error caused by loading duplicate trusted certs
Merge branch 'duplicate-cert-fix'
Mark popen4 tests "volatile" to prevent spurious Ci failures
Merge branch 'popen4-test-volatile'
Update the man pages for chef & knife.
Remove ohai man page since it needs to live in ohai repo.
Merge branch '11-stable'

This merge doesn't bring in the version number change which should be different on master.

Conflicts:
	distro/common/man/man8/chef-expander.8
	distro/common/man/man8/chef-expanderctl.8
	distro/common/man/man8/chef-server-webui.8
	distro/common/man/man8/chef-server.8
	distro/common/man/man8/chef-solr.8
Update the help topics based on changed man pages.