Merge r1619105,1619118,1619153,1619802 from /trunk resolving
the file rename conflict. This contains the new test case.

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