lockfree: merge fixes from trunk 


svn path=; revision=84401