Merge proposals dependent on lp://qastaging/~drizzle-trunk/libdrizzle/jenkins-Libdrizzle-106

1. jenkins-Libdrizzle-106
2. Dependent merge proposals