OP-1554 Scope re-factoring to prepare for enum plot.
Merge branch 'rel-14.10' into next
Merge branch 'rel-14.10' into next
Merge branch 'rel-14.10' into next
Merge remote-tracking branch 'origin/rel-14.10' into next
Merge remote-tracking branch 'origin/rel-14.10' into next
Merge remote-tracking branch 'origin/rel-14.10' into next
OP-1558 Remove empty resource file.
Merge remote-tracking branch 'origin/next' into thread/OP-1554_Enum_Scopes
OP-1554 More re-factoring.
OP-1554 Re-factoring
OP-1554 Re-factoring
OP-1554 Re-factoring
OP-1554 Re-factoring

Moved initialization of QwtPlot curve in to PlotData class.
OP-1554 Cleanup and rename.
OP-1580 Upgraded to Qwt 6.1.1
OP-1580 Fixed some visuals
OP-1554 Added functionality to add fields with enum type and have markers added to scopes.

Still a few smallish things to fix.
OP-1554 Changed some visuals.

Fixed logging to include enum types.
More tweaking of defaults