Merge proposals dependent on lp://staging/~mozillateam/lightning-extension/lightning-extension.oneiric

1. lightning-extension.oneiric
2. Dependent merge proposals