[AURON #2352] Lock spills before new spiller#2350

wForget wants to merge 2 commits into

apache:masterapache/auron:masterfrom

wForget:devwForget/blaze:devCopy head branch name to clipboard