Merge r1555403 from trunk.

Manually apply the change to update the output of the version command since
this has been reworked since 1.7.x.


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