CMS-3400 Difficult to drag FormItemSet
Changed to packaging jar before moving to OSGi.
Merge branch 'master' into CMS-3310