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

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