Merge proposals dependent on lp://staging/~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-199

1. jenkins-Drizzle-Builder-199
2. Dependent merge proposals