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

This reverts commit 474fcbabd930f61a395b2709c8a0e972d87a7ce1.
Rebase from 'upstream'
Trimmed the branch to only the settlerlib sub directory