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

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