Merge changes from topic "blkid_static"

* changes:
  [automerge] Replace blkid with blkid_static 2p: 25fce71b19
  Replace blkid with blkid_static