Merged r10688 from trunk to 1.4-stable
Backout r10253.
Backout replacing shoulda context of test/unit/helpers/issues_helper_test.rb. Test methods in shoulda context do not run on Ruby 1.8.7-p370.
Merged r10689 from trunk to 2.1-stable
Partial backout r10263.
Merged r10688 from trunk to 2.1-stable
partial backout r10263
backout r10253
Wiki page versions routes cleanup.
Japanese translation updated by Go MAEDA (#12171)
Don't show watch, lock/unlock, delete links on previous wiki page versions.
Handle deleted wiki page versions (#10852).
Adds cc and bcc to email log messages (#12090).