use ruby 2.1 compatible mocha with all versions of ruby

makes the lockfile the same between 1.9 and 2.1

Change-Id: I3ab1c3c7a7fcb8e6a5aba0170744d04739029209
Reviewed-on: https://gerrit.instructure.com/40753
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
fix double requiring of application.rb

This happens when script/rails is executed via a symlinked canvas
directory

Change-Id: I64fc408244ead13c3c78580c3b3e72102445df34
Reviewed-on: https://gerrit.instructure.com/40740
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Updated es translation

Change-Id: Ic8301c484cb63827abd5e368766e4ad46f40621c
Updated de translation

Change-Id: I22cbbf7c6fee0bca7dba3f6584da8149ec4a2e1c
Updated ru translation

Change-Id: I1fa3916dec52d8e2e95c0580638e5c3c7b9a1047
Updated fr translation

Change-Id: I02c67a56dd50c880e4813f6df7ee31fea00845ae
Updated pl translation

Change-Id: I7c8aa3ba1aa8510493da1d84a3e75711ff6c3fb8
Updated zh translation

Change-Id: Ifc0e4ba6a86edc1a293a506949c0eeb29ff900ff
Updated ar translation

Change-Id: Iae6b8ffb7d7238e84485c77b5afae0d5f6d9ef0a
Updated pt translation

Change-Id: I1bd70da97b6376b526719b500eb8021d145affb4
Updated pt-BR translation

Change-Id: I339c59e01a30ceff42b982f384ba75a8720e28f5
Updated ja translation

Change-Id: I6e78ff0a93d8f718b532c4374eb7ac47fc558164
Updated nl translation

Change-Id: I09365acf46394fd42afcabe2b2a355c8f3f5d2af
Updated nb translation

Change-Id: I0577c00ed76dfba005bddbf358be49d2c25ca3d3
Updated ko translation

Change-Id: I75a099422e67e626fe97d2980a7bca5ab8610eef
Updated en-GB translation

Change-Id: Ie6358112ff7fa53a16c30860f51c1d6981972b7b
Updated en-AU translation

Change-Id: Ie9630cb95d58739ae1a72345b068055351daebb3
Updated tr translation

Change-Id: I0de7db5235cd932dfeece7af2ea78497e8bec00f
Updated fa-IR translation

Change-Id: Ic5d1744bb91d180118c99cf3020a9c36d255db98
speed up account settings users

fixes: CNVS-14742

Preloads admin users communication channels. In role overrides
it changes the class call for context to index by context_id.
Since we know they should always be accounts.

Test Plan:
  - The initial Account settings page should load quicker.
  - Full permission regression testing.

Change-Id: Iadeb55e3b6163421605d1829fa4789c5e1fe9a7e
Reviewed-on: https://gerrit.instructure.com/40360
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: August Thornton <august@instructure.com>
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Nick Cloward <ncloward@instructure.com>