Bugfix: incorrect number of raft layers was generated when too few were requested. #1678

Conflicts:

	lib/Slic3r/Print/Object.pm