Merge proposals dependent on lp://staging/~cprov/launchpad/bug-412715-registration-info-in-base-layout

1. bug-412715-registration-info-in-base-layout
2. Dependent merge proposals