Merge remote-tracking branch 'nasa/open1404' into open1427

Merge in preparation for review/integration, WTD-1427

Conflicts:
	platform/commonUI/general/res/templates/containers/accordion.html

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

@@ -75,13 +75,12 @@
                   mct-drag="controller.continueDrag(delta)"
                   mct-drag-up="controller.endDrag()">
             </span>
-            <!--span
-                class="edit-corner edit-resize-nw"
-                style="position: absolute; right: 0px; width: 12px; top: 0px; height: 12px; cursor: ne-resize;"
+            <span
+                class="edit-corner edit-resize-ne"
                   mct-drag-down="controller.startDrag(childObject.getId(), [0,1], [1,-1])"
                   mct-drag="controller.continueDrag(delta)"
                   mct-drag-up="controller.endDrag()">
-            </span-->
+            </span>
             <span
                 class="edit-corner edit-resize-sw"
                   mct-drag-down="controller.startDrag(childObject.getId(), [1,0], [-1,1])"