make relay and config mutually exlusive, add overlapping parameters to
config
Merge branch 'add_more_config_args'