Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.

* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269