Bump up version
Automatic commit of package [rubygem-openshift-origin-dns-avahi] release [1.10.2-1].
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
oo-admin-ctl-domain: don't use CloudUser.new

Instead, use CloudUser.find_or_create_by_identity, which is now the
correct way to create a new account.
Generic exceptions should always be handled with rescue_from
Don't return on the last line of controller methods
rescue_from handlers should have proper access to user info set via UserActionLog filter
Move most DocumentNotFound handling to ApiResponse#render_exception

Abstracts the details of not found errors globally to allow much simpler controller code.
Add test cases for not_found messages and behavior
Authorizations will not return specific id messages
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
Test custom cart creation
Remove binding.pry, causing failures
Merge remote-tracking branch 'origin/master' into handle_global_exceptions_properly

Conflicts:
	console/test/integration/rest_api/authorization_test.rb
	controller/app/controllers/alias_controller.rb
Missed a rescue of Mongoid::Errors::DocumentNotFound
Merge remote-tracking branch 'origin/master' into handle_global_exceptions_properly

Conflicts:
	controller/app/controllers/domains_controller.rb
Fix failing test in api_responses
Merge branch 'master' of github.com:openshift/origin-server
Convert keys_controller - work around double deletion bug in console code