Merge proposals dependent on lp://qastaging/~bkerensa/redshift/fix-for-typos

lp://qastaging/~bkerensa/redshift/fix-for-typos has no merge proposals.