Make sure spiral vase mode is not enabled for multi-island layers. #1938

Conflicts:

	lib/Slic3r/GCode/Layer.pm
	t/shells.t