This should fix (2). So there's just one more test failure remaining.
Bug 1523957 Comment 53 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
This should fix (2). So there's just one more test failure remaining. New try: https://treeherder.mozilla.org/#/jobs?repo=try&revision=ace548ef217487231b2bff9ec860c9ace803fb41