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

This reverts commit 11cb43758993cfab89cde88ed0b2e920b72ea52f.
Rebase from 'upstream'
Trimmed the branch to only the lockfree sub directory