Merge "Revert "Renamed bootstrap_vars for new syntax""