Merge proposals dependent on lp://qastaging/~danilo/launchpad-work-items-tracker/remove-roadmap-code

1. remove-roadmap-code
2. Dependent merge proposals