Merge r1482759 and r1482779 from trunk onto the 1.7.x-r1482759 branch.

Used the following command to avoid conflicts:
  svn merge -c r1482759,r1482779 \
    ^/subversion/trunk/subversion/svnserve/svnserve.c \
    subversion/svnserve/main.c


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-r1482759@1483585 13f79535-47bb-0310-9956-ffa450edef68