Merge branch 'dev'
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
Merge branch 'master' of github.com:openshift/origin-server
re-enabed ews2
Cgroups developer docs
Merge branch 'master' of github.com:openshift/origin-server into misc-dev
Mock environment call for simplicity in some states
Process help option.
Merge pull request #1083 from bdecoste/master

Merged by openshift-bot
Merge pull request #1092 from smarterclayton/mock_environments_for_test

Merged by openshift-bot
Merge pull request #1095 from rmillner/BZ888188

Merged by openshift-bot
Quickstart scalability now determined in summary field
Added unit tests for quickstart scalability parsing
Faster regex + DRYer mocking for unit tests
BZ888671 -  oo-accept-broker or oo-accept-systems will create production.log, the file's permission is wrong.

In doing this I also switched all the logs to have a mode of 640.  This also
resolves the user_action.log issue:
https://github.com/openshift/origin-server/issues/977
Revised quickstart scalability check to handle nil summary
Merge branch 'master' of github.com:openshift/origin-server into misc-dev
Merge pull request #1085 from calfonso/master

Merged by openshift-bot
Minor tweak to the broker log owner/mode issue

I'm not comfortable relying on attr and ghost to work as I would expect it.
This makes the intention a little more clear: "No matter what happens, make
sure the files are owned by apache and have a mode of 640"