Merge "Fixing vPE config creation anf bring up issues."