408858 : preserve existing folders in Deployment Assembly

Change-Id: I60888d73ef83571b894300a0620c7ac0a38c626d
Signed-off-by: Fred Bricon <fbricon@gmail.com>
Make conversion tests more resilient to plugin version changes

Change-Id: I27f155915e182435ae63f7db9edeb57584cb2127
Signed-off-by: Fred Bricon <fbricon@gmail.com>