Merge pull request #120 from vuntz/sync-conf-trivial

Synchronize tempest.conf with latest version [part 1]
Add/remove the trivial new/old options in tempest.conf
Add new object-storage-feature-enabled options
Add remaining new options from current tempest