Merge remote-tracking branch 'upstream/develop' into sam_dev1
Added parsing and extracting functions for raet formatted opts['master']
Still need to test
Changed how timeout works in RAETChannel
Merge remote-tracking branch 'upstream/develop' into sam_dev1
Merge pull request #16520 from SmithSamuelM/sam_dev1

Changed way timeout in RaetChannel.send() works