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

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