LPS-40048 Keep previous logic in place. Removing the ThreadLocal has changed it
LPS-22629 Fix test
LPS-40144 Variables in UserNotificationDeliveryType should not be static
LPS-40152 Add updateUserNotificationDelivery method in UserNotificationDeliveryLocalService
LPS-40152 Regen