Merge pull request #4204 from lnader/master

Merged by openshift-bot
Merge pull request #4210 from bparees/mock_error

Merged by openshift-bot
Up tries on http assertions in functional API
Merge pull request #4212 from pmorie/dev/fix-tests

Merged by openshift-bot
Allow users to override the RAILS_ENV and RACK_ENV in Passenger
Update cartridge_guide to mention Django/Rails development mode
Fix viminfo file error when using vim within gears
Bug 1032950

Change ownership of by-id link to gear uid/gid so future deployments
that don't go through mcollective don't fail because of file
permissions issues.
Fix bug 1032888: select ssh url on mousedown
Merge pull request #4215 from jhadvig/vim

Merged by openshift-bot
Bug 1032901 - Removed perl5lib folder from GIT and added to dependency_dirs
Merge pull request #4214 from ncdc/bz1032950-lchown-by-id-link

Merged by openshift-bot
Added a CSV-driven Origin Hangouts page
Merge pull request #4205 from liggitt/bug_1030774_domain_info_overflow

Merged by openshift-bot
Added preamble text to hangouts page
Merge pull request #4216 from liggitt/bug_1032888_middle_click_copy

Merged by openshift-bot
Merge pull request #4217 from pmorie/bugs/1010464

Merged by openshift-bot
Fleshed out the Origin Hangouts page
Merge pull request #4219 from mfojtik/bugzilla/1032901

Merged by openshift-bot
node: make sure to own the /var/log/openshift/node directory in rpm