Merge "Set version of ejbca-ce image"