Merge branch 'master' of https://github.com/nasa/openmctweb into search

platform/core/src/objects/DomainObject.js

@@ -35,7 +35,7 @@ define(
          *
          * @param {string} id the object's unique identifier
          * @param {object} model the "JSONifiable" state of the object
-         * @param {Object.<string, Capability|function} capabilities all
+         * @param {Object.<string, Capability>|function} capabilities all
          *        capabilities to be exposed by this object
          * @constructor
          */

platform/framework/src/resolve/BundleResolver.js

@@ -45,7 +45,7 @@ define(
              * into one large object containing resolved extensions from
              * all bundles (in the same form.)
              *
-             * @param {Object.<string, object[]>[]} resolvedBundles
+             * @param {Object.<string, object[]>|Array} resolvedBundles
              * @returns {Object.<string, object[]>}
              */
             function mergeResolvedBundles(resolvedBundles) {