Account for various Trebuchet 10.2/11 data

Add in original-package tag so we don't force users to lose their data.

Change-Id: I7bece10a5d49c2d8f37aface615cb27d532cdaa6