Minor fixes, removed duplicate entry for a column in schema-410-420.
Renamed a method.
Unit tests for zone to vmware datacenter mapping model.