1145734 - more correct error message when apache fails
Merge pull request #1270 from asmacdo/1145734

1145734 - more correct error message when apache fails
Clarify contribution expectations
Merge pull request #1287 from asmacdo/clarify-contribution-docs

Clarify contribution expectations
merge 2.5-dev