some KWallet format "improvements"
Merge branch 'bleeding-jumbo' into bleeding-mask

* bleeding-jumbo:
  some KWallet format "improvements"