Implement attribute handling during context merging#2599

fedejeanne merged 2 commits intoeclipse-platform:mastereclipse-platform/eclipse.platform:masterfrom

vlakn:context.merge.implement.attribute.handlingvlakn/eclipse.platform:context.merge.implement.attribute.handlingCopy head branch name to clipboard