Merge in latest from master into topic branch for
nasa/openmctweb#115
Conflicts:
platform/features/conductor/src/ConductorRepresenter.js
platform/features/conductor/src/ConductorTelemetrySeries.js
platform/features/conductor/src/TimeConductor.js
platform/features/conductor/test/ConductorRepresenterSpec.js
platform/features/conductor/test/ConductorTelemetrySeriesSpec.js
open #1515
open #117
Markup changed to utilize mct-representation via CSS;
time-controller now uses list-based _constants values;
ConductorRepresenter.js modded to remove inline styling
and to add CSS classes to enclosing mct-representation;
Rename TimeConductorController to TimeRangeController, to
reflect that this is intended to serve as a more general
control. Additionally, stop using arrays for inner and
outer bounds and instead use explicit start/end properties,
for clarity. WTD-1515
Retain reference to scope in ConductorRepresenter
directly via this, instead of revealing via
a closure-bound function. This approach is not necessary
to avoid https://docs.angularjs.org/error/ng/cpws in
this circumstance. WTD-1515
