Attempt to fix cycles OSL link error on windows 64 bit.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@54232 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #33874: active UV map chooser in uv editor should not have X button as you
can't not have an active UV map.

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