Fix shelving files could lead to losing some changes previously shelved

[SRombautsU]

Ensure that all the files to shelve are still in the changelist, so that we can shelve them

This is because of the workaround that requires to create a new shelve and delete the old one