Merge InterAvailabilityZoneDynamicCluster and DynamicCluster

- make DynamicCluster configurable, to do inter-availability zones