Add test that xml body was parsed successfully.
Increases wait_for_notification timeout to 60 seconds
Uses present in bokchoy test
Merge pull request #4223 from edx/benmcmorran/increase-notification-timeout

Increases wait_for_notification timeout to 60 seconds
Display names, help text, and "deprecated" for Advanced Settings.

STUD-302, STUD-303
Merge pull request #4073 from edx/christina/advanced-settings-hack

Display names, help text, and "deprecated" for Advanced Settings.
Enable Mixed Modulestore STUD-1540
Refactor get_parent_locations STUD-1663
Merge pull request #3915 from edx/studio/uses-mixed-modulestore

Enable mixed modulestore
Merge pull request #4206 from edx/oleg/lti-xmlns-test

Add test that xml body was parsed successfully.
Corrected event name in description
Merge pull request #4235 from edx/ahodges/documentation/DOC639

Corrected event name in description
Merge pull request #1 from edx/master

sync