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

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