v3.6.0
refs AE-855 Change-Id: Ia72f0be21d73d52e8df7739841995b9873510207 Reviewed-on: https://gerrit.instructure.com/c/switchman/+/343351 Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com> Reviewed-by: Jacob Burroughs <jburroughs@instructure.com> QA-Review: Aaron Ogata <aogata@instructure.com> Product-Review: Aaron Ogata <aogata@instructure.com>