Clear out junk from Vagrant+DevStack configs

Change-Id: Id5909cf2b43d4a91e5a62b11cfb9329cb84c762c
Merge "Clear out junk from Vagrant+DevStack configs"