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

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