re-synced with trunk r527913.


git-svn-id: https://svn.apache.org/repos/asf/lenya/branches/trunk-rework-pubconf@528481 13f79535-47bb-0310-9956-ffa450edef68
44 files changed