Merge r1531014, r1532316, r1536350, r1536383, r1536464, r1536488
from ^/subversion/trunk and resolve text conflicts in move_tests.py


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