Merge proposals dependent on lp:~piastucki/bzr-eclipse/rework-annotation-information-control

1. rework-annotation-information-control
2. Dependent merge proposals