Merge r1551524 from trunk:

 * r1551524, 1551579
   Fix an 'No Write Lock' error when moving files between externals and
   parent working copies or vice versa.
   Justification:
     svn move should just work in these cases.
   Votes:
     +1: rhuijben, stefan2, breser


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1565079 13f79535-47bb-0310-9956-ffa450edef68
Merge the r1549858 group from trunk:

 * r1549858, r1549874
   Make svn_client_proplist4() behave as documented when reporting inherited
   properties.
   Justification:
     The current implementation with multiple callbacks for the same path
     just makes things hard on api users that want to use inherited properties
     as intended.
   Votes:
     +1: rhuijben, philip, breser


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