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

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