Add wait time to pidfile test to avoid race condition

Signed-off-by: Eric Malm <emalm@pivotallabs.com>
Auto-merge remote-tracking branch 'upstream/master'