Update segment.io shim for mobile event syntax change.
Replace "edX Studio" with "{studio_name}"

For theming and internationalization
Refactor sock HTML to have text in Mako template
Merge pull request #6319 from edx/hotfix/analytics-mobile-shim

Update segment.io shim for mobile event syntax change.
Silence noisy factory loggers in lms unit tests
fix pylint errors in test.py
Send the user to the login page if registering with a linked but inactive account
Merge pull request #6345 from edx/hotfix/third-party-auth-inactive-linked-fix

Send the user to the login page if registering with a linked but inactiv...
Change contracts to allow user_id with type long(). Add tests.
Merge pull request #6343 from jzoldak/zoldak/quiet-factory-debug-msgs

Quiet factory debug msgs for troubleshooting failing lms unit tests
Merge pull request #6355 from edx/release

Release
Merge pull request #6350 from edx/jeskew/asset_md_contract_fix

Change contracts to allow user_id with type long().
Use STUDIO_SHORT_NAME for Studio

STUDIO_NAME = "edX Studio"
STUDIO_SHORT_NAME = "Studio"
Add settings comment about STUDIO_NAME and STUDIO_SHORT_NAME
Merge pull request #6309 from edx/db/edx-studio-as-format-string

Replace "edX Studio" with "{studio_name}"