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

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