lockfree: merge fixes from trunk


svn path=/branches/release/libs/lockfree/; revision=84630