Fix cleanup command

There are few issues in cleanup command which makes it
in failure state.

1. Deprecated tenant name of identity grp is being used
   - Devstack does not set these deprecated options now so it fails
     with tenant Not Found
2. Running cleanup operation for --init-saved-state option too
   - --init-saved-state option should just save the state not run actual
     cleanup. After states are saved, user should be able to verify/edit that and
     then run cleanup in normal mode.

With above issues fix, cleanup command runs successfully.

Change-Id: Ifd393d1f8d6e070e52e2a0a2d42a765cd6d4f5f5
2 files changed