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/commonUI/general/res/templates/containers/accordion.html

@@ -19,10 +19,16 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="accordion-head" ng-click="toggle.toggle()">
+<div
+    class="accordion-head"
+    ng-click="toggle.toggle()"
+    ng-class="{ expanded:!toggle.isActive() }"
+    >
     {{container.label}}
 </div>
-<div class="accordion-contents"
-     ng-show="!toggle.isActive()"
-     ng-transclude>
-</div>
+<div
+    class="accordion-contents"
+    ng-show="!toggle.isActive()"
+    ng-transclude
+    >
+</div>