Merge "Added support for 'bugreport -z'." into nyc-dev