Fixed a couple of small merge errors.

Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/makesrna/intern/rna_modifier.c

Fix for incorrect DNA field name in versioning, causes constant
resetting of clump noise size on reload.

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Use separate flags to enable/disable clump and roughness curves for
child hairs.

This allows disabling the curves temporarily without losing the setup.

Conflicts:
source/blender/blenkernel/BKE_blender.h

Fix for slow deformation-motionblur in Cycles using the new spiral kink
mode.

This was caused by variation of the number of keys on child hairs due
to shortening of hair curves based on euclidian distances. The other
kink modes also shorten hairs, but use the parametric distance instead,
which does not vary with deformation of hairs.

Second variant of the copy-to-select operator for particles to only
copy the active particle system (and not remove existing in the process).

Make removal of existing particle systems on copying optional.

This will be most useful when copying individual particle systems
one-by-one (to be implemented).

Added space selection option to the particle system copy operator.

By default this now copies from one object's local space to another
object's local space (instead of the previous world space). This is
more useful when transferring particles between objects, because it
doesn't require moving objects on top of each other, as long as they
have similar shapes.

Removed debugging code.

Fix for particle system copy: This has to make sure the ORIGSPACE data
layer is available.

Otherwise particle mapping to the new mesh cannot work with subdivided
and constructively-modified meshes.

Added a "specials" menu button next to the particle systems list for
accessing the copy operator.

Changed the workflow for the particle system copy operator to the common
active-to-selected pattern.

New operator for copying (hair) particle systems from one object to
another, including edit data (grooming).

This uses basically the same method as the existing connect/disconnect
feature. The main difference is that it allows working with multiple
objects and transferring the //particle/hair data// instead of the
//mesh// data (which is what connect/disconnect expects). This is a much
more realistic workflow when rigging, topology etc. changes and
groomed hair has to be transferred to the changed model.

Removed unused particles pointer from particle edit data.

New texture influence option for particle kink amplitude (as opposed to
frequency).

Renaming "Kink" texture influence to "Kink Frequency" to be more
specific.

Spiral rotation axis was not always fully normalized, avoid an assert.

Make random child length work again with the spiral kink mode.

Add missing stub to the player, so buildbot keeps delivering gooseberry builds

Allow clumping and roughness in Spiral kink mode as well.

This requires interpolating the parent key properties, because no single
parent key can be mapped to each key on the children any more.

Optional randomization factors for the spiral radius and axis orientation.