Move the unordered library into 'branches' now that it has been accepted.


[SVN r42181]
Merge.

[SVN r42408]
Fix some merge errors.

[SVN r42409]