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

This reverts commit 81e29357b3dfb31bf2f7464653bd6549125e706b.
Rebase from 'upstream'
Trimmed the branch to only the lisp_unit sub directory