Merge branch 'open-master' into open1273

Merge latest from master branch into topic branch
for WTD-1273.

platform/features/layout/res/templates/frame.html

@@ -35,7 +35,7 @@
     </div>
     <div class="abs object-holder">
         <mct-representation key="representation.selected.key"
-                            mct-object="domainObject">
+                            mct-object="representation.selected.key && domainObject">
         </mct-representation>
     </div>
 </div>

platform/features/layout/src/LayoutController.js

@@ -90,6 +90,10 @@ define(
             function lookupPanels(ids) {
                 var configuration = $scope.configuration || {};
 
+                // ids is read from model.composition and may be undefined;
+                // fall back to an array if that occurs
+                ids = ids || [];
+
                 // Pull panel positions from configuration
                 rawPositions = shallowCopy(configuration.panels || {}, ids);