Merge r1483939 from trunk as an obvious fix (javadocs go to src dir instead of
build dir.



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