fix bad code merge
fix bad code merge

c408ea5edfa6483d4411314081b416ad44d4df83 should not have removed the
"root_admin" section of this method.  because it did, we now have the
old implementation cached under the new cache key, so I'm bumping that
again (and there will be a separate commit against master and 2016-10-29
to just bump that key.

fixes CNVS-32642

test plan:
- admins should see the "customize help menu" link on the 2016-10-08
branch

Change-Id: I744d5ad782170fcba23996f601aa63ec6e3a2775
Reviewed-on: https://gerrit.instructure.com/93470
Reviewed-by: James Williams  <3a5f4ed991dbfa5c9ef76ad729d240ca12f62180@instructure.com>
Product-Review: Simon Williams <088e16a1019277b15d58faf0541e11910eb756f6@instructure.com>
QA-Review: Simon Williams <088e16a1019277b15d58faf0541e11910eb756f6@instructure.com>
Tested-by: Simon Williams <088e16a1019277b15d58faf0541e11910eb756f6@instructure.com>

SwinburneOnline/canvas-lms,grahamb/canvas-lms,sfu/canvas-lms,venturehive/canvas-lms,djbender/canvas-lms,HotChalk/canvas-lms,HotChalk/canvas-lms,venturehive/canvas-lms,HotChalk/canvas-lms,grahamb/canvas-lms,grahamb/canvas-lms,sfu/canvas-lms,djbender/canvas-lms,SwinburneOnline/canvas-lms,sfu/canvas-lms,venturehive/canvas-lms,djbender/canvas-lms,sfu/canvas-lms,grahamb/canvas-lms,venturehive/canvas-lms,djbender/canvas-lms,sfu/canvas-lms,SwinburneOnline/canvas-lms,sfu/canvas-lms,HotChalk/canvas-lms,sfu/canvas-lms,grahamb/canvas-lms,SwinburneOnline/canvas-lms