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

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