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

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