Bug 971106: Fix skip_maven_build marker support
Eliminate noisy output from php control script
Use a gray for code colort
Limit spacing to direct child and give them a tad more room
Merge pull request #2772 from ironcladlou/dev/v2carts/php-control-fix

Merged by openshift-bot
Merge pull request #2770 from ironcladlou/bz/971106

Merged by openshift-bot
Merge pull request #2776 from smarterclayton/fix_code_color

Use a gray for code color, merge steve's changes
<common> fix .spec so oo-diag is in non-scl locations
Automatic commit of package [rubygem-openshift-origin-console] release [1.10.1-4].
Merge pull request #2778 from sosiouxme/diagnostics

Merged by openshift-bot
Merge branch 'master' of github.com:openshift/origin-server into dev-general