Merge proposals dependent on lp:~tapaal-contributor/tapaal/merge-components-changed-lens-1947689

1. merge-components-changed-lens-1947689
2. Dependent merge proposals