Conflicts:
	repository/org.eclipse.ice.repository/ice.product.launch

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