Fix conflict between the type propagation and normal modes about rejecting some substitutions.
Merge branch 'feature/merge-develop-version2-041114' of github.com:ontop/ontop into feature/merge-develop-version2-041114