Merge "Be less aggressive in removing old remote bugreport files" into nyc-dev