XX-9767 PT-336655 Multiple zones in a cluster.
XX-9767 PT-336655 Multiple zones in a cluster.
Merge branch 'multi-tz-4-from-stable' into release-4.6-unstable

Conflicts:
	sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/vm/RemoteMailboxManagerImpl.java