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

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