Merged fixes from 1.7.x - remove SPSS and CSV specific exceptions, add new test cases for duplicate entities and overflow var values