JAL-3848 ensure annotation from a service gets a calcId so it can be updated and...