Avoid 409 Conflict on entity deletion

Previously entity deletion failed with 409 Conflict when the
the swift container was non-empty.

Change-Id: I5159e770d2568ea7601438dd31647991148bb27a