Resolve test_utils conflict post merge, bug 877923