Fixed some more porting problems with external raet
Merge remote-tracking branch 'upstream/develop' into sam_raet_35
Removed master_keys which depends on  salt.transport.table which no longer exists
Merge pull request #11911 from SmithSamuelM/sam_raet_35

Fixed some more stuff associated with external Raet