Merge proposals dependent on lp:~vjsamuel/drizzle/more-opt-file-fixes

lp:~vjsamuel/drizzle/more-opt-file-fixes has no merge proposals.