Merged r3537 and r3572 from trunk.
Merged r3494 from trunk.
Backported r3608 from trunk.
Merged r3529 from trunk.
Merged r3514 from trunk.
Merged r3558 from trunk.
Merged r3513 and r3531 from trunk.
Merged r3603 from trunk.
Merged r3539 from trunk.
Fixed: Update of Subversion changesets broken by r3466 under Solaris (#5255).
