Merge "Split bugreport identifier into id and pid." into nyc-dev