Cherry-pick r1462402 from branches/verify-at-commit.  This removes a 'verify' call in maintainer builds and simplifies code.
Cherry-pick r1462402 from branches/verify-at-commit.  This removes a 'verify'
call in maintainer builds and simplifies code.

(As a side-effect, this will cause the eventual coalescion of the branch
into trunk to not be a simple "reintegrate-style" merge.)

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1462403 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion