Revert "Merge branch 'jjardon/fail_on_overlap' into 'master'"

Seems the fail-on-overlap: true setting in project.conf is not part of the cache key, so the project didn't got rebuild and is possible we get build failures when the components actually rebuild

This reverts !317 (merged)