Merge proposals dependent on lp:~tapaal-contributor/tapaal/update-zoom-percentage-on-ctrl+scroll-1785023

1. update-zoom-percentage-on-ctrl+scroll-1785023
2. Dependent merge proposals