Free Standards Group and OSDL to merge