On 1.8.x-gpg-agent branch: Merge r1600331, r1600348, 1600368, r1600563, r1600781 from trunk.

SVN_VA_NULL changed to just NULL since that macro is not available in 1.8.x


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x-gpg-agent@1600790 13f79535-47bb-0310-9956-ffa450edef68