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 commit 'refs/changes/97/81497/6' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch
Merge commit 'refs/changes/49/81849/1' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch