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

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