update substitution param files, the datagen had a bug where it omitted times in seconds rather than ms
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'