Merge proposals dependent on lp:~phoenix-firestorm/phoenix-firestorm/llconvexdecompositionstub

1. llconvexdecompositionstub
2. Dependent merge proposals