Stop a few more upgrade tests from running in Valgrind, since they
time out in server restart.

Change-Id: I0a1be2c9d71661f45b34c91f3aa692f29fa99f67