Merge proposals dependent on lp://qastaging/~salgado/launchpad-work-items-tracker/blueprints-over-time

1. blueprints-over-time
2. Dependent merge proposals