Merge proposals dependent on lp://qastaging/~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-67

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