Revert "Logic fixes in clone_server_array() method."

This reverts commit 338301e6b6eb6fc891dcb48d6556291193d2ae55.

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