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
Strong consistency is the default for mongoid
Merge branch 'master' of github.com:openshift/origin-server
Fixes for F19 runtime extended tests
* Fix platform-oo-admin.feature to use mock instead of ruby and python
* Fix cloud domain used in application_steps.rb
* Add missing haproxy/scaled gear steps
* Fix jenkins test to understand different api versions
   - Old api returns color of build
   - new api returns string (notbuilt, built, etc)
Merge branch 'master' of github.com:openshift/origin-server
Merge pull request #3074 from kraman/bugfix2

Merged by openshift-bot
Bug 973796 - PassengerPreStart points at root which logs errors
Merge pull request #3089 from brenton/BZ973796-2

Merged by openshift-bot
Authorization test case was wrong
Merge pull request #3083 from smarterclayton/strong_consistency_is_default

Merged by openshift-bot
Add support for upgrade script to be called during cartridge upgrades.

Trello: https://trello.com/c/JdLrIBk2/173-2-upgrade-process-improvement (origin_runtime_173)