Merge branch 'master' into parmvir

Conflicts:
	codegen/org.eclipse.papyrusrt.codegen.papyrus/plugin.xml

Change-Id: I1a8728e06589781551d73d44ce7f9c67ac2a67c8
Signed-off-by: yroh <ysroh@zeligsoft.com>