DNN-5733 + CONTENT-3852 - Ensured that a module can be deleted and restored in the same version