Merging from production branch to trunk

svn merge -r108266:108604 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

One merge conflict, in indra/backbone/agent_linden_dollar.py, which was
very small, and resolved by Kartic & Prospero.