Merged r13117 from trunk to 2.4-stable (#16685)

Gemfile: upgrade mocha version.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13119 e93f8b46-1217-0410-a6f0-8f06a7374b81