Add currency_cd field to CloudUser
Updated Comprehensive Deployment Guide for v4
Interim change for v4 - all docs built from master.
oo-diagnostics: Read /proc instead of using ps

In test_mcollective_context, read /proc/#{pid}/attr/current to determine
the process's domain instead of using using the output of ps, which is
affected by mcstransd.

This commit fixes bug 1119923.
Merge pull request #5603 from nhr/comprehensive_guide_update

Merged by openshift-bot
Merge pull request #5605 from nhr/v4_docs_interim_rake_change

Merged by openshift-bot
Merge pull request #5594 from liggitt/add_currency_code

Merged by openshift-bot
Merge pull request #5606 from Miciah/bug-1119923-oo-diagnostics-read-slashh-proc-instead-of-using-ps

Merged by openshift-bot
OAuth - should be able to specify what HTTP method is being used when signing a request
Merge pull request #5610 from jwforres/oauth_specify_method

Merged by openshift-bot
Initial support for Ruby 2.0
Update Rest API Integration test for ruby-2.0 cartridge
Added SECRET_KEY_BASE environment variable to support rails4
Added ruby-2.0 test cases
Update Application Controller Test for ruby-2.0 cartridge
Merge pull request #5542 from mfojtik/ruby20

Merged by openshift-bot
Card origin_node_401 - Support Vendor in CartridgeRepository

* Allow vendored cartridges to have the same name
* Update usages of CartridgeRepository
Card origin_node_401 - Support Vendor in CartridgeRepository

* Updates from reviews
Bug 1119609 - Support vendor in oo-admin-cartridge
Bug 1120463 - Update man pages