Merge proposals dependent on lp://staging/~brianaker/libdrizzle/private-headers-connection-test

1. private-headers-connection-test
2. Dependent merge proposals