Places: Manually integrated places specific changes from r76602


git-svn-id: http://svn.openkomodo.com/repos/openkomodo/trunk@13570 b87d16e7-d29f-4ee1-b5ec-817d645d335f