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

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