Merge proposals dependent on lp://qastaging/~brianaker/libdrizzle/bootstrap-update-april-2013

1. bootstrap-update-april-2013
2. Dependent merge proposals