Additional fix for Gump failure and to address buildbot failures triggered by the first part of the Gump fix.
Additional fix for Gump failure and to address buildbot failures triggered by the first part of the Gump fix.

git-svn-id: 79cef5a5a257cc9dbe40a45ac190115b4780e2d0@1848668 13f79535-47bb-0310-9956-ffa450edef68

apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat,apache/tomcat