Vat fix conditional dates and Twistlock duplicates -> Development

IBVAT-299 Keeps and restores conditional approval dates on version bumps IBVAT-381 Duplicate Twistlock findings no longer drop from VAT

-- Please contact Irma Kramer to schedule a review.