Upmerge of empty merge changesets from the release backmerges (5.0.96, 5.1.62).

Manually resolved conflicts in ".bzr-mysql/default.conf" (tree name)
and in "storage/innodb_plugin" (does not belong into 5.5).