Better handling of zone and kvm for info, console and zdoor.
Merge branch 'test' into dev