Updated data gathering script

Server information is now gathered by using server list command.  This
gives us less host data, but the data accuracy seems to be better.

Change-Id: I70e520be23ea60956574a2a66fbdba9c373ec511
Merge "Updated data gathering script"