Refactored zoneAffinity Test; add non contigious ids test cases
fix storage service test affected by turning off server routing
Merge branch 'zone-shrinkage' of github.com:voldemort/voldemort into zone-shrinkage
StorageService Test with non contiguous zone/node ids