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

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