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

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