Merge changes from topic "fix_rocky" into mcp/xenial/rocky

* changes:
  mke2fs: do not use full path
  Kick issues which appeared after patch