Merge branch 'R3_6_maintenance' into R3_6_maintenance_Java7
tree: 985f2e42da6fc8ea64f2ccafac905f77af020035
  1. bundles/
  2. features/