Comment 9 for bug 1683076

@Robie - sorry the trusty patch was indeed messed up. I've rebuilt and retested the patch with appropriate dep3 headers and such and you'll find it more inline with the other patch versions. The trusty one varies slightly due to the unit test import differences (I tried to keep the same style) and the method signature for logging in the trusty version.