Merge "Reduce disk space limit for incident reports." into pi-dev