merging from trunk from r209127 to r209863



git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable@209866 13f79535-47bb-0310-9956-ffa450edef68
9 files changed