cleanup.
Set ulimit -u (RLIMIT_NPROC) to unlimited for RHEL init script.
Shorter desc
language cleanup
storage
merge
This test needs to wait for s2 also, otherwise the "expect" there may
never be reached.

Split out the param settings, so we can see the previous values.
Oops, shouldn't have units on that param.