On the fsx branch:  Merge the svn_stream__from_spillbuf API change (r1430673)
from /branches/fsfs-format7. Fixed libsvn_fs_base/lock.c to make it compile.

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