Merge pull request #11911 from SmithSamuelM/sam_raet_35

Fixed some more stuff associated with external Raet
Merge pull request #11913 from SmithSamuelM/sam_raet_35

Removed references to raet and table from setup.py