Patch Set 2: Abandoned

The rename attempted in patch set 1 is wrong, and I stepped on it by mistake with patch set 2 sent to the wrong change.  Further, patch set 2 is dead, we can't rely on Tycho right now for building a P2 update site.