Merge changes Ice70d9ab,Iba7ac028

* changes:
  os-release.d: remove deprecated cfgtree support.
  os-release.d: Add system_id.