Merge proposals dependent on lp://staging/~gmb/launchpad/inline-help-for-bugwatches-2-bug-530162

1. inline-help-for-bugwatches-2-bug-530162
2. Dependent merge proposals