Control: owner 840676 ! I ended up creating duplicate packaging and merged my changes which included a version bump. I didn't look, but remember at least some of these modifications being present in the current packaging. Sometime today, I'll take a look and see if any changes still need to be made. If not, I'll go ahead and close this bug.