Merge proposals dependent on lp://staging/~stolowski/qtcreator-plugin-ubuntu/remove-annotation-from-scope-template

1. remove-annotation-from-scope-template
2. Dependent merge proposals