Comment 6 for bug 1738249

Hi Kathy, thanks for creating a branch for this. I had a branch our there for the duplicate bug 1743661, but since we basically did the same thing, I'll create a signoff branch for yours and I'll try and see if I can get the other issues you mentioned corrected.