Merge "Remove skip code for test_servers_whitebox as bug had been fixed"