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

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