Revert "Revert "Logic fixes in clone_server_array() method.""

This reverts commit 9a3ddc85a666b327ed3a4217a14315f8b94203c2.

Change-Id: If639d7394fcdc31333237060e24b13c5008da244
Merge "Revert "Revert "Logic fixes in clone_server_array() method.""" into red_black