Add CentOS 7 version to base-vm.
Re-org factory-vm.  Add var to maintain VM variants. Move common scripts and containers into common folder.