Code review comment for lp://staging/~dholbach/help-app/1423871

<dholbach> dpm, ok, I'll work on bug 1425010 next now, but maybe it'd make sense to land the branches now, so it'll be easier for others to look at the branches
<dholbach> the code is in better shape now then it was
 and I'll try to make the following MPs more targetted
<dpm> dholbach, makes sense, thanks!
<dholbach> ok