Revert "Trimmed the branch to only the lockfree sub directory"

This reverts commit eb1f9f50a2f26e179fddb02195ad30b023fb2f2c.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the lockfree sub directory