This should address the failures seen in Travis Build Run #8774. It is likely there are others which also need addressing - they will be addressed on a case-by-case basis as they come up.