Merge pull request #1586 from nasa/correct-format-updates

[TC] Update format on timesystem change

platform/features/conductor/core/src/ui/TimeConductorController.js

@@ -406,6 +406,7 @@ define(
             var config = this.getConfig(timeSystem, clock);
 
             this.$scope.timeSystemModel.selected = timeSystem;
+            this.$scope.timeSystemModel.format = timeSystem.timeFormat;
 
             if (clock === undefined) {
                 this.timeAPI.timeSystem(timeSystem, config.bounds);