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

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