Fix incorrect tempest config groups

This commit fixes a couple of tempest config options that were being
iniset to the wrong config group. This wasn't caught in the gate
because the default behaviors matched.

Change-Id: I273db85ba310faa1ba7662a42f951a1ee97b431b
Merge "Fix incorrect tempest config groups"
Merge branch 'master' of https://github.com/openstack-dev/devstack