fixup! stbt.*_motion: global parameters for motion testing are set in stbt.conf

refactor parameter substitution functions for match and motion into one
function.