bugfix: [#36786] customdata layers are not merging taken the names into consideration
(which is also "[#36749] Joining objects with more than one uv map depends on list order")

Thanks Bastien Montagne and Brecht van Lommel for reviewing and some advice.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60288 954f8c5b-7b00-dc11-b283-0030488c597c
Fix [#36788] changing the built in keying set prints "attempt to free NULL pointer" to console.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60291 954f8c5b-7b00-dc11-b283-0030488c597c
style cleanup: whitespace & odd indentation


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@60293 954f8c5b-7b00-dc11-b283-0030488c597c