Merged r13110 from trunk to 2.5-stable (#16685)

introduce request_store to ensure that the current user doesn't leak across request boundaries.

Contributed by Holger Just.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13111 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13112 from trunk to 2.5-stable (#16685)

Gemfile: use double quote for request_store

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13113 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merged r13117 from trunk to 2.5-stable (#16685)

Gemfile: upgrade mocha version.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13118 e93f8b46-1217-0410-a6f0-8f06a7374b81
2.5-stable: revert r13111 and r13113 (#16685)

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13120 e93f8b46-1217-0410-a6f0-8f06a7374b81
Merge remote-tracking branch 'upstream/2.5-stable' into ro-2-5
update dependency