Merge proposals dependent on lp://staging/~wallyworld/launchpad/inconsistent-linked-bug-portlet-1033354

1. inconsistent-linked-bug-portlet-1033354
2. Dependent merge proposals