If microsites are enabled and it is a microsite request, then take the microsite path for theming
Update xblock-mentoring.

Update reference to the xblock-mentoring repository.

A bug where answers containing the string "??" would get mangled by jQuery has been fixed in xblock-mentoring.
Remove duplicated data from legacy events

When event-tracking was fully integrated into the platform, some data was replicated in the context in the middleware and then later extracted and moved the old location by event-tracking. The legacy code path was not updated to remove this transient shim data from the context resulting in duplication of the information. This patch ensures that the transient information is removed from the context before emitting the event.

Fixes: AN-2369
update bok choy db caches
Remove tooltip manager to get tests working in CMS again.
Merge pull request #4664 from edx/chrisitna/disable-tooltip-manager

Remove tooltip manager to get tests working in CMS again.
Add Eng (GB) and Albanian lang codes
allow rsyslog to be none
Update translations (autogenerated message)
Merge pull request #4672 from edx/sarina/080414-translation-update

Sarina/080414 translation update
Merge pull request #4566 from mulby/remove-duplicate-context-fields

Remove duplicated data from legacy events
updating handlers list to conditionally include syslogger-remote
Annotation Tool: Flagging plugin should now allow instructors to remove flags from annotations

Annotation Tools: Added lots of comments, fixed spacing, fixed slice issue

Annotation Tools: i18n fixed for this tool

 - fixed Translator to Translators

Annotation Tools: Removed unnecessary class and worked with element object
Instructors can view previously sent email content

Previously on the send email page of the instructor dashboard, instructors could only view
task information about emails they've sent for their course in the past.
In addition to this, I've now added the ability to see the content of all previously sent emails.

A "Sent Email History" button has been added to the page. When clicked, a table displaying the
subject line, number of emails sent, and date/time of submission for each previously sent email
is created. An instructor can then click on any subject line to see the content of that email,
displayed in a modal window that appears on the page.

The window is also equipped with a "copy email to editor" button, which copies the emails contents
to the tinyMCE editor, so that an instructor can easily resend an email that they've sent
in the past.
Merge pull request #4378 from lduarte1991/lduarte-harvardx-pr10

Annotation Tool: Fixed Flagging for Instructor flag removal
Merge pull request #4451 from Stanford-Online/njdupoux/email-content-history

Instructors can view previously sent email content
Refactor ADVANCED_COMPONENT_TYPES

    Modified to a setting in CMS common.py and aws.py
    Also factored out are: ADVANCED_PROBLEM_TYPES

    This enables third parties to add XBlocks to their system
    without having to make a code change.

    Code also added to ensure that a component should exist in both
    ADVANCED_COMPONENT_TYPES and the course advanced module list
    in order for it to be enabled in the course.
Added clarification for events that do/not include session values
Merge pull request #4683 from edx/ahodges/documentation/AN2976

Added clarification for events that do/not include session values
Merge pull request #4512 from Stanford-Online/dcadams/refactor_advanced_component_types

Refactor ADVANCED_COMPONENT_TYPES