Fixed: issue optimistic locking broken by r3308 (#5280).
Merged r3613 from trunk.
Merged r3612 from trunk.
Merged r3611 from trunk.
Linkify folder names on revision view (#5164).
Merged r3397 from trunk to fix sqlite3 and pgsql test environments.
Merged r3635 from trunk.
Merged r3625 from trunk.
Merged r3614 from trunk.
Merged r3517 from trunk.
