Merge proposals dependent on lp://qastaging/~brianaker/drizzle/pid-file-fix

lp://qastaging/~brianaker/drizzle/pid-file-fix has no merge proposals.