CLIENT: wrap text in baton message history text box
GDA-5476: Allow multiple Y axes to be used in the scan plot view 
http://jira.diamond.ac.uk/browse/GDA-5476

ScanPlotSettings has extra method:
/**
 * yAxesMap axis name map.
 * Key - name of y_axis being plotted. To match a value in y_axes
 * Entry - name of the y axis to use if the default axis is not to be
used
 */
public void setyAxesMap(Map<String, String> yAxesMap) 

Support new field yAxesMap in
uk.ac.diamond.scisoft.analysis.plotserver.OneDDataFilePlotDefinition
GDA-5512: ScanPlotView does not honour preferences for line styles 
http://jira.diamond.ac.uk/browse/GDA-5512
GDA-5513: ScanPlot update period needs to be configurable
http://jira.diamond.ac.uk/browse/GDA-5513
GDA-5476: Allow multiple Y axes to be used in the scan plot view 
http://jira.diamond.ac.uk/browse/GDA-5476
GDA-5476: Allow multiple Y axes to be used in the scan plot view 
http://jira.diamond.ac.uk/browse/GDA-5476
Merge branch '8.30'

Conflicts:
	uk.ac.gda.client/src/uk/ac/gda/client/liveplot/LivePlotComposite.java
IN PROGRESS - issue GDA-5476: Allow multiple Y axes to be used in the
scan plot view 
http://jira.diamond.ac.uk/browse/GDA-5476
GDA - Fix use package conflict on org.mockito.mockito-core