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

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