Comment 5 for bug 611224

Thanks for the work there, Luke could you review if the changes are correct and sponsor that? The indicator patch is being reworked by dx so we can probably rebase and fix that once the new version is in but can you check the other packaging changes?