Fix php upgrade for 0.0.17
Merge pull request #5525 from pmorie/upgrade

Merged by openshift-bot
Making apache server-status optional with a marker
Adding documentation regarding the new apache server-status marker
Bug 1109645: Setting mysql2 variable for bundler
Bug 1110287: Removing thread-dump dependency from ruby-1.8 cunfig.ru template
Fix bug 1111009: Typo on app scaling page
Merge pull request #5527 from jhadvig/BZ_1110287

Merged by openshift-bot
Merge pull request #5528 from liggitt/bug_1111009_typo

Merged by openshift-bot
Merge pull request #5523 from jhadvig/status

Merged by openshift-bot
Merge pull request #5526 from jhadvig/BZ_1109645

Merged by openshift-bot