Revert "Add cluster and extra disk info to query vmconfig"
Revert "Add cluster and extra disk info to query vmconfig"

This reverts commit 421bed2a23ebf09ac0c4e4b8da1a08420f7e9774. It breaks
the createcfg option for using query vmconfig to create a build config,
and needs more work to function properly.

mdechiaro/vctools,mdechiaro/vctools