Changed how timeout works in RAETChannel
Changed how timeout works in RAETChannel
Merge branch '2014.7' of github.com:cro/salt into 2014.7
Merge pull request #16534 from cro/2014.7

Backport RAET timeout patch