Merge branch 'next'

Conflicts:
	org.eclipse.ice.caebat.batml/pom.xml
	org.eclipse.ice.client.widgets.rcp.test/META-INF/MANIFEST.MF
	org.eclipse.ice.client.widgets.rcp.test/pom.xml
	org.eclipse.ice.client.widgets.rcp/META-INF/MANIFEST.MF
	org.eclipse.ice.client.widgets.rcp/pom.xml
	org.eclipse.ice.core.test/pom.xml
	org.eclipse.ice.datastructures/pom.xml
	org.eclipse.ice.developer.moose/pom.xml
	org.eclipse.ice.developer/pom.xml
	org.eclipse.ice.feature/feature.xml
	org.eclipse.ice.feature/pom.xml
	org.eclipse.ice.filesimulation/pom.xml
	org.eclipse.ice.materials/pom.xml
	org.eclipse.ice.persistence.xml.test/pom.xml
	org.eclipse.ice.persistence.xml/pom.xml
	org.eclipse.ice.reflectivity.ui/pom.xml
	org.eclipse.ice.repository/category.xml
	org.eclipse.ice.repository/ice.product
	org.eclipse.ice.repository/pom.xml
	org.eclipse.ice.servicetester/pom.xml
	org.eclipse.ice.tablecomponenttester/pom.xml
	org.eclipse.ice.viz.service.geometry.test/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service.geometry.test/pom.xml
	org.eclipse.ice.viz.service.geometry/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service.geometry/pom.xml
	org.eclipse.ice.viz.service.jme3.test/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service.jme3.test/pom.xml
	org.eclipse.ice.viz.service.jme3/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service.jme3/pom.xml
	org.eclipse.ice.viz.service.mesh.test/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service.mesh.test/pom.xml
	org.eclipse.ice.viz.service.mesh/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service.mesh/pom.xml
	org.eclipse.ice.viz.service.paraview.test/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service.paraview.test/pom.xml
	org.eclipse.ice.viz.service.paraview.web/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service.paraview.web/pom.xml
	org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service.paraview/pom.xml
	org.eclipse.ice.viz.service.test/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service.test/pom.xml
	org.eclipse.ice.viz.service.visit.test/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service.visit.test/pom.xml
	org.eclipse.ice.viz.service.visit/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service.visit/pom.xml
	org.eclipse.ice.viz.service/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.service/pom.xml
	org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/VizConnection.java
	org.eclipse.ice.viz.test/META-INF/MANIFEST.MF
	org.eclipse.ice.viz.test/pom.xml
	org.eclipse.ice.viz/META-INF/MANIFEST.MF
	org.eclipse.ice.viz/pom.xml

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>