Merge proposals dependent on lp://qastaging/~salgado/launchpad/workitems-parsing-and-updating

1. workitems-parsing-and-updating
2. Dependent merge proposals