Merge branch 'bugs/JAL-1138_osgi' into Release_2_8_2_Branch