lockfree: merge fixes from trunk

this commit should hopefully fix up the merge info



[SVN r82185]

libs/lockfree

@@ -1 +1 @@
-Subproject commit 66d065a4071be85c927c7bfb0e9172d3f95de916
+Subproject commit 2caf2cc251e0d623a30dc76eb6fcc5d43ddb2e69