Merge pull request #4777 from danmcp/master

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-phpmyadmin] release [1.18.6-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.20.6-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [1.20.4-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-mod-rewrite] release [0.3.4-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.20.5-1].
Automatic commit of package [openshift-origin-msg-node-mcollective] release [1.20.3-1].
Automatic commit of package [openshift-origin-cartridge-php] release [1.20.5-1].
Automatic commit of package [openshift-origin-cartridge-python] release [1.20.5-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.20.6-1].
Automatic commit of package [rubygem-openshift-origin-common] release [1.19.4-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [1.20.5-1].
Automatic commit of package [openshift-origin-cartridge-perl] release [1.19.5-1].
Automatic commit of package [openshift-origin-cartridge-cron] release [1.18.4-1].
Automatic commit of package [openshift-origin-broker-util] release [1.20.5-1].
Bug 1065681 - Allows users to specify what folder/files supervisor will watch
Merge pull request #4779 from mfojtik/bugzilla/1065681

Merged by openshift-bot
Bug 1065506 - Increase OPENSHIFT_NODEJS_POLL_INTERVAL default value to 10000
Merge pull request #4778 from mfojtik/bugzilla/1065506

Merged by openshift-bot
Fix typos