Merge changes from topic 'bug_30451114' into nyc-mr1-dev

* changes:
  Deprecated 'adb bugreport' with flat files.
  Minor improvements on bugreport generation.