This commit removes some comment-outed codes. If we want to use them, we
can get them from the git repository.
Change-Id: Ie438c43d332d0631750f0ad458653fc40e23faad
Ensure building, installing multiple nova vms works after we
split the build script as build nova vm, install nova vm.
Change-Id: Iadb6e181caec511325a30727bf9e9c79e8afea5a