Test timer tweak
Allow the dbnames parameter to specify roles when doing an add database
Allow 'conflict' as an alias for 'conflict_strategy'
Allow the CSV format when doing add database
Fixes and debugging for conflict strategy code
Allow alternate ways to say conflict_strategy (which is a pain to type!)