DOCS-2287 rs.add no longer disconnects shell

Ready for merge.