Bug 1014793 - Added 'wait_for_pid_file' function to Bash SDK

This function is used to wait 10 seconds for PID file to be
written by Apache process. All Apache based cartridges were
updated to use this function.
Bug 1024046 - template columns of the console help page
Merge pull request #4168 from mfojtik/bugzilla/1014793

Merged by openshift-bot
app_info.rb in right place for rhel
Fix upgrade issues when check_deployments_integrity is called with no options
Bug 1029685 - Remove :cart_list fact

* Has been broken for last 3 months, no one complained.
Merge pull request #4178 from jwforres/bug_1024046_silver_addtl_help_links

Merged by openshift-bot
Merge pull request #4179 from tdawson/2013-11/tdawson/oo-admin-info-app

Merged by openshift-bot
Removing json-c for now as it requires upstream work
Merge pull request #4182 from jwhonce/wip/oo-devel-node

Merged by openshift-bot
Fix bug 1029745: billing info form
Merge pull request #4180 from pmorie/bugs/deployment-integrity

Merged by openshift-bot
Merge pull request #4183 from liggitt/bug_1029745_billing_info_form

Merged by openshift-bot
Fix bug 1028389
Merge pull request #4184 from pmorie/bugs/1028389

Merged by openshift-bot
Bumping cartridge versions for 2.0.36
Automatic commit of package [rubygem-openshift-origin-node] release [1.17.4-1].
Automatic commit of package [openshift-origin-broker-util] release [1.17.5-1].
Automatic commit of package [openshift-origin-cartridge-postgresql] release [1.17.3-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [1.17.2-1].