Test fix for #11717

Conflicts:
	salt/state.py