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

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