Add missing fields, comment out old fields
Merge branch 'master' of github.com:vmware-serengeti/vhm