Merge "mv wspr module command into servicerunner since it's only used here."