Changes to accomodate WorkQueueDelete to have a boolean to control
whether to delete entries on shutdown or not

Change-Id: Ib68930b6cb9795c5d12ad26272c4faaaecbc9b1c