Merged r12414 (#15623).
Merged r12349 (#15523).
Merged r12309 (#15398).
make WatchersHelperTest passes when config.threadsafe! is enabled (#12097)
make IssuesHelperTest passes when config.threadsafe! is enabled (#12097)
use environment variable for extacting SCM repositories in ci.rake
Merged r12424 from trunk to 2.4-stable.
fix svn raw diff failure on svn version 1.6.17 (revision 1128011).
fix svn raw diff failure on svn version 1.6.17 (revision 1128011)
Rails4 compatibility of Setting model
Rails4: db migrate: replace "Permission.find_by_controller_and_action"