Merge "Make bugreport_dir a common variable." into nyc-mr1-dev