Update loadtests to track upstream changes

The updated loadtests have been on a branch for far too long, let's get them merged back to master.  @jbonacci f? and @chilts r?