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

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