Backport fix around backstop to prevent deletion of tempdirs (tolerate unicode returns)
update branch so 0.7.2 is buildable