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

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