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

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