On the 'move-tracking-2' branch: do the 'keep-alive' dance after the cherry-
pick of r1607334 from the branch to trunk in r1607346. In other words,
record-only merge r1607346 from trunk to the branch.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/move-tracking-2@1612330 13f79535-47bb-0310-9956-ffa450edef68