add dependency + correct url
Merge pull request #4189 from luka5/patch-1

Merged by openshift-bot
Make tests using deployment_tester easier to debug
Merge pull request #4191 from pmorie/dev/fix-tests

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.17.5-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.18.2-1].
Bug 1031509 - Fixed typo in node.js cartridge package.json
Merge pull request #4193 from mfojtik/bugzilla/1031509

Merged by openshift-bot
Fix bug 1031563 - highlight error messages generated by formtastic
Fix assertion messages in functional api
Merge pull request #4195 from liggitt/bug_1031563_error_message_highlight

Merged by openshift-bot
Bug 1029679: handle connection refused error with clean error message
Merge pull request #4196 from pmorie/dev/fix-tests

Merged by openshift-bot
Merge pull request #4192 from bparees/haproxy-connect-fail

Merged by openshift-bot
Flatten gears in the app
Merge remote-tracking branch 'upstream/master'