Update ssh slave management

Merge of two commits:
c041c3f4cb65329c8dbcd1d56328b9a51a73bcf1
I253f22673d0fdd4ca301ad3e2a0b109dff5894da

PROD-30944

Change-Id: If841f6da0b9b6c7693787d4acd28722f1b19d1f9
(cherry picked from commit c041c3f4cb65329c8dbcd1d56328b9a51a73bcf1)
1 file changed