Merge changes from topic "discard" into oc-dev

* changes:
  [automerger] [DO NOT MERGE] make_f2fs: issue discard commands on mkfs am: dd89f9cde6 am: cbba57fb8a am: 671c19a0bd am: f56ec9d4a3 skipped: f85f40e80c
  [automerger] [DO NOT MERGE] make_f2fs: issue discard commands on mkfs am: dd89f9cde6 am: cbba57fb8a am: 671c19a0bd am: f56ec9d4a3
  [automerger] [DO NOT MERGE] make_f2fs: issue discard commands on mkfs am: dd89f9cde6 am: cbba57fb8a am: 671c19a0bd
  [automerger] [DO NOT MERGE] make_f2fs: issue discard commands on mkfs am: dd89f9cde6 am: cbba57fb8a
  [automerger] [DO NOT MERGE] make_f2fs: issue discard commands on mkfs am: dd89f9cde6
  [DO NOT MERGE] make_f2fs: issue discard commands on mkfs