salt: more bootstrap, change req in master grain set