GDS-1345
GDS-1344
Minor fix to handle some disconnect cases
Merge branch 'master' of ssh://github.com/graniteds/graniteds