Bug 4906: Allow fine calculation to exclude grace period