Add missing routes for env_vars feature
Migrated notes on local DNS from drupal wiki module
Merge pull request #4726 from nhr/openshift-origin-release-3

Migrated notes on local DNS from drupal wiki module
Corrected MCollective log locations in comprehensive guide
Merge pull request #4757 from nhr/comprehensive_guide_corrections_oo_v3

Corrected MCollective log locations in comprehensive guide
fix line formatting
Merge pull request #4691 from getupcloud/fix_env_vars_routes

Add missing routes for env_vars feature
Update Contributor's Guide with more detail.

Conflicts:
	documentation/oo_contributors_guide.adoc
Merge pull request #4795 from nhr/contributors_guide_improvements_oo3

Update Contributor's Guide with more detail.
Add missing image for contribtutor's guide
Merge pull request #4803 from nhr/add_image_for_contributors_guide

Add missing image for contributor's guide
Add Vagrant deployment guide and modify Contributors Guide
Merge pull request #4842 from nhr/oo3_add_vagrant_info

Add Vagrant deployment guide and modify Contributors Guide
Fix bug 1048992: Define remote_request? in console controller
Merge pull request #4915 from worldline/openshift-origin-release-3

Fix bug 1048992: Define remote_request? in console controller
X-Remote-User must be blocked at the toplevel apache
Merge pull request #5332 from brenton/openshift-origin-release-3

X-Remote-User must be blocked at the toplevel apache
Update Vagrant guide w/ info on plugin gem
Merge pull request #5394 from nhr/vagrant_doc_update_v3_branch

Vagrant doc update v3 branch
Bug 1110283 - Escape Source-Url during clone/copy

Conflicts:
	node/lib/openshift-origin-node/model/cartridge_repository.rb