Merge "Infra-4300 Updated OSGi Working Group Charter to 1.2"