lockfree: merge changes from trunk



[SVN r85192]
lockfree: merge fixes from trunk


[SVN r86299]