Merge branch 'master' into persist-on-mutation-825

Conflicts:
	platform/core/src/capabilities/PersistenceCapability.js
	platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js

platform/core/bundle.js

@@ -19,7 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-/*global define*/
 
 define([
     "./src/objects/DomainObjectProvider",
@@ -88,7 +87,6 @@ define([
     Instantiate,
     legacyRegistry
 ) {
-    "use strict";
 
     legacyRegistry.register("platform/core", {
         "name": "Open MCT Web Core",