Merge branches 'opaque-keys-base-keys', 'opaque-keys-cms', 'opaque-keys-common-djangoapps', 'opaque-keys-common-lib-xmodule', 'opaque-keys-common-misc', 'opaque-keys-django-fields', 'opaque-keys-embargo-tests', 'opaque-keys-library', 'opaque-keys-lms-courseware', 'opaque-keys-lms-djangoapps', 'opaque-keys-lms-templates', 'opaque-keys-mongoengine-fields', 'opaque-keys-requirements' and 'opaque-keys-roles-table' into opaque-keys