Merge "Limit tempest.config's use of cfg.CONF"