Comment 5 for bug 1548993

Thank you Jason and Jeanette! I added Jeanette's and my own sign-offs and merged to master and 2.10.

I'm leaving 2.9 open for now. There were some minor conflicts to resolve, and I didn't have enough time to address them before wrapping up for the day. I will take care of them later tonight or tomorrow.