Applied r1054918 also to the trunk (was applied only to the 1_5_x branch).
Applied r1054918 also to the trunk (was applied only to the 1_5_x branch).

git-svn-id: 3a0daac14c5e6bfdff62a55945ca5e1dd585acf7@1072187 13f79535-47bb-0310-9956-ffa450edef68

apache/rampart,apache/rampart