JAL-3140 reduced coupling to intervalstore.jar