CLI Guide: Update sahara, trove

Regenerate trove with current openstack-auto-command tool for
consistency with other chapters.
Regenerate sahara with new release (just version number update).

Change-Id: I601e7bbcc3f4780049b1b0a0905b3b389de9683d
Merge "CLI Guide: Update sahara, trove"