o.c.u.shift: increase version
Merge branch 'master' of https://github.com/ControlSystemStudio/cs-studio
Merge pull request #819 from berryma4/master

o.c.u.shift: increase version
o.c.u.shift.ui: increase version
#734: Log configuration
Adding a prototype view which lists all the avaiable loggers and allows
the enabling and disabling of consoleViewerHandler and also the loggger
configuration
Conflicts:
	core/plugins/org.csstudio.logging.ui/.classpath
Merge pull request #821 from shroffk/4.0-3.3.x

Merge #734: Log configuration view from 3.3 to master
Converter: make EDM OPIs the default for related displays
o.c.opibuilder.converter: change symbol conversion to EDM symbol
EDM Converter: Use special close method that works with OPI Shells
EDM Converter: o.c.opibuilder.converter: Use forground colour on Byte Monitor
Extend EDM Converter to handle MenuMux widgets
Extend menuMux conversion to handle multiple value-symbol pairs

- Enfore restriction that ONLY ONE symbol may be define for any set of values
EDM Converter: o.c.opibuilder.converter: Changed to use Dawn XY-Graph
o.c.opibuilder.converter: DLS Specific: Convert EDM ExtendedRelatedDisplayClass
o.c.opibuilder.converter: Better translation of graph properties
o.c.opibuilder.converter: Show CSS grid lines if any are selected in EDM

In EDM there are 3 tiers of gridline, in CSS only 1 coarse tier.
It is better to show some grid lines then non at all when EDM is
showing fine ones.
o.c.o.converter: Force parentMacros to be included in RelatedDisplays

- Possible fix to action button macro handling, forcing parent macros to be passed to child opi panel. This supports WRs macro-based path mangling.
o.c.o.converter: Add PSS and Radiation symbols

to converter Symbol class.
o.c.o.converter: Increase xyGraph buffer size to 65536.
o.c.o.converter: add / correct PSS symbols for DLS widget