Merge Patrick's changes from master - fixup resource jarring as caught by the unit test.
More merging - this time from origin jsirois/sync/pants-1.