Make --show-deleted and --sort-dir option names consistent
Make --show-deleted and --sort-dir option names consistent

We were using -d for --show-deleted and -s for --sort-dir sometimes, and
we were also using -s for --show-deleted and -d for --sort-dir in other
places. This is inconsistent. The command line also reserved -d for
--debug, that will be an even worse problem.

This patch proposes a solution:

  use '-D' for '--show-deleted' all the time;
  use '-s' for '--sort-dir' all the time;
  reserve '-d' for '--debug'.

Change-Id: I8dbe88f71e2541f2b4273c5add76a3cc6b0dbebd

stackforge/python-senlinclient,openstack/python-senlinclient,stackforge/python-senlinclient,openstack/python-senlinclient