rename definitions files to use vbmachine pattern
Sync rhel6 branch with changes to upstream vbmachine.cfg renaming
Update to vbmachine naming convention