Merge "Fix tempest init to update config options"